merge of '832167cf1cc0ab655072532b7c546a8a25821e44'
authorJan Lübbe <jluebbe@debian.org>
Tue, 22 Jul 2008 15:50:44 +0000 (15:50 +0000)
committerJan Lübbe <jluebbe@debian.org>
Tue, 22 Jul 2008 15:50:44 +0000 (15:50 +0000)
     and 'e4aab546c3b33577e2fb6bcfe199da5a98b4a9a3'


Trivial merge