merge of '367c12212e0958deb4779abbb80a10a6bd71e208'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 13 Sep 2007 12:35:39 +0000 (12:35 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 13 Sep 2007 12:35:39 +0000 (12:35 +0000)
commitad46b59bcccfdc65b24eb5e38d04f4ba6d48a966
treeed57185ddceb5361fd3bd21ce3a1f9ef2fda935f
parentf56aa96551afb6d34edea945ae6f31134e3b582a
parent77d7c7c9e58d1f042a270e70cd1d73a53bd63a28
Merge ... '367c12212e0958deb4779abbb80a10a6bd71e208'
     and '9efbf30d62a0b59fefb30c23ea0e41390a2ef60e'