Merge branch 'core36'
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 29 Jan 2010 05:52:00 +0000 (06:52 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 29 Jan 2010 05:52:00 +0000 (06:52 +0100)

Trivial merge