Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 15 Sep 2009 18:09:46 +0000 (20:09 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 15 Sep 2009 18:09:46 +0000 (20:09 +0200)

Trivial merge