merge of '2f33e3153b5f921d4625e4f8ea16adf0f25d161c'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 22 May 2007 15:18:21 +0000 (15:18 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 22 May 2007 15:18:21 +0000 (15:18 +0000)
commit4f7f71458454c6780cb437f8c0e86624cadc0460
tree83f24b98cc0bfaac29e16af5056cb85ea0091412
parenteb466dfa3cfb6f5b5cd63a614a1f059a8df580e8
parent59d151b3a9e96849981f30f8e3420713be5446d3
Merge ... '2f33e3153b5f921d4625e4f8ea16adf0f25d161c'
     and '502da1565df8ea89aed66c5cfc7dee8319969c68'