merge of '5bee5fc529fd2691fe3b0a867bbb28edcd59b01d'
authorJan Lübbe <jluebbe@debian.org>
Thu, 29 Nov 2007 18:48:52 +0000 (18:48 +0000)
committerJan Lübbe <jluebbe@debian.org>
Thu, 29 Nov 2007 18:48:52 +0000 (18:48 +0000)
     and '805d2f01c6463550c4d0dd1f943fc6f32ae13613'


Trivial merge