Merge branch 'master' into 2.9beta1
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 10 Dec 2010 23:32:24 +0000 (00:32 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 10 Dec 2010 23:32:24 +0000 (00:32 +0100)

Trivial merge