Branch merge
authorAlexander Wirt <formorer@grml.org>
Fri, 18 May 2007 12:52:16 +0000 (14:52 +0200)
committerAlexander Wirt <formorer@grml.org>
Fri, 18 May 2007 12:52:16 +0000 (14:52 +0200)

Trivial merge