Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 6 Sep 2010 19:50:49 +0000 (21:50 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 6 Sep 2010 19:50:49 +0000 (21:50 +0200)

Trivial merge