Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 4 Jul 2011 19:09:54 +0000 (21:09 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 4 Jul 2011 19:09:54 +0000 (21:09 +0200)

Trivial merge