merge of '128beb53ed0092647984a87f2a86eaec9d1f3510'
authorJan Lübbe <jluebbe@debian.org>
Thu, 3 Jan 2008 15:48:31 +0000 (15:48 +0000)
committerJan Lübbe <jluebbe@debian.org>
Thu, 3 Jan 2008 15:48:31 +0000 (15:48 +0000)
     and '2a1403c40d81aff7aa7bbe8236c502336c5b9a09'


Trivial merge