Merge branch 'core51'
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 17 Aug 2011 14:32:16 +0000 (16:32 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 17 Aug 2011 14:32:16 +0000 (16:32 +0200)

Trivial merge