Merge remote-tracking branch 'origin/next' into kernel-update
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 7 Jul 2012 21:17:25 +0000 (23:17 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 7 Jul 2012 21:17:25 +0000 (23:17 +0200)

Trivial merge