Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 17 May 2011 21:39:58 +0000 (23:39 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 17 May 2011 21:39:58 +0000 (23:39 +0200)

Trivial merge