Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 5 May 2011 20:03:41 +0000 (22:03 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 5 May 2011 20:03:41 +0000 (22:03 +0200)

Trivial merge