merge of '909c507b800748c820ddc73a2c5bed204cbdbd65'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 23 Apr 2007 16:51:13 +0000 (16:51 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 23 Apr 2007 16:51:13 +0000 (16:51 +0000)
commit001fa95cbe05feec31fa77c5192c6b251cf28b7c
tree9896dc638aaf3c944d8e455227fc4161c5b7e8c8
parentd9f0c399c1afb4bb50e860370fd3adae82c7d34f
parent740cae9f84e571437d39f0b3bfb16ce3d49f7b84
Merge ... '909c507b800748c820ddc73a2c5bed204cbdbd65'
     and 'de1c6225e9834b778c351b84978458d315dbbcb5'