Merge commit 'origin/core51'
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 9 Aug 2011 03:44:34 +0000 (05:44 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 9 Aug 2011 03:44:34 +0000 (05:44 +0200)

Trivial merge