Merge commit 'origin'; branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 10 Oct 2010 10:05:56 +0000 (12:05 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 10 Oct 2010 10:05:56 +0000 (12:05 +0200)

Trivial merge