Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 18 May 2011 20:11:44 +0000 (22:11 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 18 May 2011 20:11:44 +0000 (22:11 +0200)

Trivial merge