Merge branch 'core40'
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 6 Sep 2010 20:37:13 +0000 (22:37 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 6 Sep 2010 20:37:13 +0000 (22:37 +0200)

Trivial merge