merge of '554d1c13766299b9a5323f5553876072c65d7ff3'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 4 Jul 2007 23:08:27 +0000 (23:08 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 4 Jul 2007 23:08:27 +0000 (23:08 +0000)
commit8daf1ae35bcd4829e440921af2ce8d2fceb42374
treee4760c350245a2260d8a7dd8b897d0d556b0787a
parent6b8577ab8c6b3b0f4fdd06ad30e324ce3e154edf
parent20ac91064e4bb08ef78588e4263a751fb15688a5
Merge ... '554d1c13766299b9a5323f5553876072c65d7ff3'
     and 'af8f1b43cae9921ff350477f84ee9b687a2c1544'