Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 2 Jun 2011 17:16:38 +0000 (19:16 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 2 Jun 2011 17:16:38 +0000 (19:16 +0200)

Trivial merge