merge of 'd7fd55c2b036fe77aaf2964c99702f65a6833031'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 12 Jul 2007 16:38:16 +0000 (16:38 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 12 Jul 2007 16:38:16 +0000 (16:38 +0000)
commit672a602ab211ed565dd542808c41a78f409498aa
treea5c832f632a206be31b73d6397db046b11a5d6f7
parent6273ca92d5f24fdf7e8c940e58998e66a86598ae
parent84978a329e9d55721bb48fcb777306ec9293b116
Merge ... 'd7fd55c2b036fe77aaf2964c99702f65a6833031'
     and 'df688aa66e8dd2c9f76bf0b2551461346a1d5981'