Merge branch 'core37'
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 9 Apr 2010 05:49:19 +0000 (07:49 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 9 Apr 2010 05:49:19 +0000 (07:49 +0200)

Trivial merge