Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 8 Oct 2009 02:44:50 +0000 (04:44 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 8 Oct 2009 02:44:50 +0000 (04:44 +0200)

Trivial merge