Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 1 Jun 2011 11:49:58 +0000 (13:49 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 1 Jun 2011 11:49:58 +0000 (13:49 +0200)

Trivial merge