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)
     and 'af8f1b43cae9921ff350477f84ee9b687a2c1544'


Trivial merge