Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 27 Jul 2011 16:46:30 +0000 (18:46 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 27 Jul 2011 16:46:30 +0000 (18:46 +0200)

Trivial merge