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)
commitd242abb918f10cbe2b51390c35fa311e9083f542
tree92c4a972a908df0a43d6b77a7a2f21c173cd0714
parentcbdde2a0573a0ccdee52e887b49bb980c161d55b
parent74947ce74fbbfd607822b5517a02e1f24c22043a
Merge ... '5bee5fc529fd2691fe3b0a867bbb28edcd59b01d'
     and '805d2f01c6463550c4d0dd1f943fc6f32ae13613'