From 22ea572da3227ffd512e11553f1b79f23abba003 Mon Sep 17 00:00:00 2001
From: Torsten Dreyer <Torsten@t3r.de>
Date: Sat, 1 Jan 2011 18:56:36 +0100
Subject: [PATCH] Merge branch 'next', remote branch 'origin' into next