Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 4 Sep 2011 13:59:37 +0000 (15:59 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 4 Sep 2011 13:59:37 +0000 (15:59 +0200)

Trivial merge