merge of '5f2600b1acc33de2cbb3e1f80dfa05badd4beec1'
authorJan Lübbe <jluebbe@debian.org>
Tue, 14 Oct 2008 14:32:05 +0000 (14:32 +0000)
committerJan Lübbe <jluebbe@debian.org>
Tue, 14 Oct 2008 14:32:05 +0000 (14:32 +0000)
commit71944e7b7c08145f149051ba88f89f9f2b5faaa4
treecc2551465fdd4bf448a076c05d48bf328209e251
parent1fed50a85dd97e56cf25576963739a97fb714dac
parente76195e13e8c2a3a3a1a9cefe290374c01bbccc2
Merge ... '5f2600b1acc33de2cbb3e1f80dfa05badd4beec1'
     and '7d56053e50a580363a8a600b8eb9cc6463548310'