Merge remote-tracking branch 'origin/next' into kernel-update
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 23 Jun 2012 11:12:37 +0000 (13:12 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 23 Jun 2012 11:12:37 +0000 (13:12 +0200)

Trivial merge