merge of '37e29e33ed5a8bc07374cf9980746d5aba2c6a90'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 22 May 2007 09:59:37 +0000 (09:59 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 22 May 2007 09:59:37 +0000 (09:59 +0000)
commit10013e9ed4e79a2f6ca0ceb6451787aaa47c46e5
treedf5aa7969402c39194c28c791a0c3168708b3401
parent69b2b0b5d684fe6c54ee87eb47bf4ec33ef2fce1
parentd53839a731ee16061a4ee7f20211785d430e1b8b
Merge ... '37e29e33ed5a8bc07374cf9980746d5aba2c6a90'
     and '5315b48797a90da8300454374f0e8dd43d8b3658'