branch merge
authorAlexander Wirt <formorer@grml.org>
Sun, 6 May 2007 21:26:09 +0000 (23:26 +0200)
committerAlexander Wirt <formorer@grml.org>
Sun, 6 May 2007 21:26:09 +0000 (23:26 +0200)

Trivial merge