Merge branch 'core45'
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 31 Jan 2011 22:09:04 +0000 (23:09 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 31 Jan 2011 22:09:04 +0000 (23:09 +0100)

Trivial merge