Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 6 Oct 2010 16:38:27 +0000 (18:38 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 6 Oct 2010 16:38:27 +0000 (18:38 +0200)

Trivial merge