Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 14 Jun 2011 18:10:55 +0000 (20:10 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 14 Jun 2011 18:10:55 +0000 (20:10 +0200)

Trivial merge