Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 13 Nov 2010 18:17:17 +0000 (19:17 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 13 Nov 2010 18:17:17 +0000 (19:17 +0100)

Trivial merge