Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 16 Sep 2009 22:55:04 +0000 (00:55 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 16 Sep 2009 22:55:04 +0000 (00:55 +0200)

Trivial merge