merge of '1df6d041b2c60bf99f158bc629911c2bd43cb76b'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 19 Dec 2006 13:03:25 +0000 (13:03 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 19 Dec 2006 13:03:25 +0000 (13:03 +0000)
     and 'f5f0e13e97c221bdaa5281f17bf2ce322fc3ea4b'


Trivial merge