merge of '24d82a2b5a32fe5d1e0f3aa0049aaa50eb5ba7bc'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 7 Feb 2007 12:05:17 +0000 (12:05 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 7 Feb 2007 12:05:17 +0000 (12:05 +0000)
     and 'bd59bf132405beb76e4a22fc2430ec43c7a0f26e'


Trivial merge