From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 27 Jul 2011 16:46:30 +0000 (+0200)
Subject: Merge commit 'origin/master' into next
X-Git-Tag: v2.9-core53~65
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f97d5ed3524d5016b203c3cac7d4b5e8adb41fb0;p=people%2Fms%2Fipfire-2.x.git

Merge commit 'origin/master' into next
---

f97d5ed3524d5016b203c3cac7d4b5e8adb41fb0