From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 17 Apr 2011 21:15:38 +0000 (+0200)
Subject: Merge branch 'master' into kernel38
X-Git-Tag: v2.9-core53~127^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0c8b5bf924443cb62ea19ff56201e6288826d264;p=people%2Fstevee%2Fipfire-2.x.git

Merge branch 'master' into kernel38
---

0c8b5bf924443cb62ea19ff56201e6288826d264