merge of '3a9c0f4a00528662d37b097973dd3b51287562c4'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Sat, 12 Jan 2008 00:40:21 +0000 (00:40 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Sat, 12 Jan 2008 00:40:21 +0000 (00:40 +0000)
commit53437a0c949737295bc9a1799c51f70cd5e21e95
treeeffca64a524bc208a557b981b1e2da60343a2920
parent774ca8a04b5999b6144dfd25bddbfa15dd02af94
parent3b85f1584efddfb1c51ddb046667d1dfe37f042c
Merge ... '3a9c0f4a00528662d37b097973dd3b51287562c4'
     and '841845db4cfff04ccff4ec075f181561fb3ad63f'