Merge branch 'core36'
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 28 Jan 2010 23:13:12 +0000 (00:13 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 28 Jan 2010 23:13:12 +0000 (00:13 +0100)

Trivial merge