Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 28 Sep 2009 21:17:49 +0000 (23:17 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 28 Sep 2009 21:17:49 +0000 (23:17 +0200)

Trivial merge