merge of '6e74b2fee10237a84d8fbb1c808ab89f75d0acc7'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Sat, 21 Oct 2006 11:16:41 +0000 (11:16 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Sat, 21 Oct 2006 11:16:41 +0000 (11:16 +0000)
commitd0d7f6fa56e67e66c9b82abcc099066884d13a11
tree79d61de45189437cf4f3ee3a4a7a9a771eec2298
parent9842fcbe255b19d4949502aae2735ecf6141c187
parent9cb6683b10dcf0508e8982a497b10630d62af38e
Merge ... '6e74b2fee10237a84d8fbb1c808ab89f75d0acc7'
     and 'fd0aec6ea64556790357667659c40906bcc453cd'