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)
commitf6add5fe0f052e3f9e42036c4c30df7b45225900
tree068c8abf1a5173af26d72f2f852e4e787498ee78
parentbc7aa85e1bf3db6ac7e31fe15fe27ec05526205a
parent23f2decbe62225e537aa4b8b72daf0f307340bbf
Merge ... '128beb53ed0092647984a87f2a86eaec9d1f3510'
     and '2a1403c40d81aff7aa7bbe8236c502336c5b9a09'