Merge branch 'work'
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 19 Apr 2008 18:44:10 +0000 (20:44 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 19 Apr 2008 18:44:10 +0000 (20:44 +0200)

Trivial merge