Merge branch 'core51'
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 23 Aug 2011 08:59:00 +0000 (10:59 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 23 Aug 2011 08:59:00 +0000 (10:59 +0200)

Trivial merge