Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 3 Sep 2011 14:05:55 +0000 (16:05 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 3 Sep 2011 14:05:55 +0000 (16:05 +0200)

Trivial merge