Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 21 Sep 2010 19:42:16 +0000 (21:42 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 21 Sep 2010 19:42:16 +0000 (21:42 +0200)

Trivial merge