merge of 'b5baf49fc7cdce9f5faaa2e3303b691a5a10b339'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 27 Feb 2007 17:25:04 +0000 (17:25 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 27 Feb 2007 17:25:04 +0000 (17:25 +0000)
commitc1f72fe801a6baf92e4910664aea8b6a2583d41a
treeb9af35f2308aa43a3963bea5c60fc8cafa1929fa
parentd6a28a95a984600a166fc57b4c5e84a8b1648c3e
parentc7ad1b5bd96857fa9633645032a1c7b1d496bf0b
Merge ... 'b5baf49fc7cdce9f5faaa2e3303b691a5a10b339'
     and 'de4deac18489c08635d1feef74f49bd72dce1d64'