Merge remote-tracking branch 'origin/next' into kernel-update
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 4 Jul 2012 08:40:34 +0000 (10:40 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 4 Jul 2012 08:40:34 +0000 (10:40 +0200)

Trivial merge