Merge branch 'master' into 2.9beta1
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 11 Dec 2010 09:04:09 +0000 (10:04 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 11 Dec 2010 09:04:09 +0000 (10:04 +0100)

Trivial merge