Merge branch 'core54'
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 27 Dec 2011 10:11:25 +0000 (11:11 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 27 Dec 2011 10:11:25 +0000 (11:11 +0100)

Trivial merge