merge of 'a536e1f1c106f600dacb9b7c677edf69297378fb'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 16 Jan 2007 19:36:02 +0000 (19:36 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 16 Jan 2007 19:36:02 +0000 (19:36 +0000)
     and 'da35453dc23555db9d4d4373003c4e47b502ee30'


Trivial merge