merge of '5c04010dc0ca86da15eacb212b5845c24d73eb1e'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 24 Jan 2008 14:16:53 +0000 (14:16 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 24 Jan 2008 14:16:53 +0000 (14:16 +0000)
commit62d4698b651ec93b84dcb2f04fffdbd2b420f103
tree20c9206d643595d0e1646b7f07c71df28aa4a658
parente762f9c4ea24e9bd3adebe51f2a88d5f95ea1cb6
parentdf8c1b2fc46ccae1e517768b56317ffdb2150409
Merge ... '5c04010dc0ca86da15eacb212b5845c24d73eb1e'
     and 'b530b781e2597a57e49d9d02d956a75f0617c9a8'