merge of '503b3ade200ad628a4b30fab228c365b8c0cf2ea'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 10 Jan 2008 23:11:30 +0000 (23:11 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 10 Jan 2008 23:11:30 +0000 (23:11 +0000)
     and '9910934c4f018cde20787ccaa558640752542098'


Trivial merge