merge of '56b25a110aa475e3158b4ad35b8444a1da0716cb'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 29 Mar 2007 19:37:50 +0000 (19:37 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 29 Mar 2007 19:37:50 +0000 (19:37 +0000)
commit05ff4add6b7a04c35631cbec817b5901ebef05b4
tree32d56cf7c333c74d6967f46e82591a2852723d59
parent77140a739890f8d17d2b3b762c71f69fcf3baeae
parentd0f8d7d128418e126277a516e614066f089adfac
Merge ... '56b25a110aa475e3158b4ad35b8444a1da0716cb'
     and '5a68fd7dd4ea1b818537db754ddc0d7ad79ca66b'