Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 21 May 2011 18:59:16 +0000 (20:59 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 21 May 2011 18:59:16 +0000 (20:59 +0200)

Trivial merge