Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 12 Jul 2011 20:30:47 +0000 (22:30 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 12 Jul 2011 20:30:47 +0000 (22:30 +0200)

Trivial merge