Merge branch 'work'
authorDaniel Glanzmann <dg@ipfire.org>
Tue, 30 Sep 2008 11:21:18 +0000 (13:21 +0200)
committerDaniel Glanzmann <dg@ipfire.org>
Tue, 30 Sep 2008 11:21:18 +0000 (13:21 +0200)

Trivial merge