Merge branch 'master' into core48
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 18 Mar 2011 07:38:34 +0000 (08:38 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 18 Mar 2011 07:38:34 +0000 (08:38 +0100)

Trivial merge