merge of '397294e12f174d25745f5b3b591468ffd54fec4d'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 8 Oct 2007 17:07:10 +0000 (17:07 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 8 Oct 2007 17:07:10 +0000 (17:07 +0000)
commit8509e92c44e3df14f799c38a0501f4127ab6e503
treea8fa81e2c76caf4d46978dc314e44f0ff8999a1b
parente04cf6dc16359fd97bf24585f29eb578fad41fc1
parent36b528a4a4215304b453843cfeb89ab12c62b4b6
Merge ... '397294e12f174d25745f5b3b591468ffd54fec4d'
     and 'e8e5e906fda8d6117edc8f3082056c7d690921a7'