branch merge
authorAlexander Wirt <formorer@grml.org>
Thu, 17 May 2007 12:18:25 +0000 (14:18 +0200)
committerAlexander Wirt <formorer@grml.org>
Thu, 17 May 2007 12:18:25 +0000 (14:18 +0200)

Trivial merge