Merge branch 'core48'
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 29 Mar 2011 14:20:45 +0000 (16:20 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 29 Mar 2011 14:20:45 +0000 (16:20 +0200)

Trivial merge