Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 20 Sep 2009 10:27:55 +0000 (12:27 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 20 Sep 2009 10:27:55 +0000 (12:27 +0200)

Trivial merge