Merge remote-tracking branch 'origin/next' into kernel-update
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 6 Jul 2012 20:53:24 +0000 (22:53 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 6 Jul 2012 20:53:24 +0000 (22:53 +0200)

Trivial merge