merge of '6aa3a34371e0ba98066d355ab1bc9a3c72356bf0'
authorJan Lübbe <jluebbe@debian.org>
Wed, 11 Jun 2008 15:48:27 +0000 (15:48 +0000)
committerJan Lübbe <jluebbe@debian.org>
Wed, 11 Jun 2008 15:48:27 +0000 (15:48 +0000)
     and '99ed4d92c897fb19999e63a3d7eb3b5fae762ff3'


Trivial merge