merge of '0e150443d291bc62c30745eee41a34a08f3eb3db'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 4 Jul 2007 12:01:08 +0000 (12:01 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 4 Jul 2007 12:01:08 +0000 (12:01 +0000)
commit58849960f0c6a71880a57d0ff7d624fc10ed1bbb
tree21f18b1d67c7871407d106792b688715af169678
parentc135979b41af99c0ab5c76e26a9652d5e8ed6858
parent5e742cbea0a8ce2c71773fc6fbb7eac0beb996ff
Merge ... '0e150443d291bc62c30745eee41a34a08f3eb3db'
     and '1b058511a74a92f00fa349a145e6d36bc37c7e21'