merge of '062ebbe44379bc5a91c32a65954e729d5496ff44'
authorKoen Kooi <koen@openembedded.org>
Thu, 18 Jan 2007 17:19:08 +0000 (17:19 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 18 Jan 2007 17:19:08 +0000 (17:19 +0000)
     and '30c4d8712344f77f9ae6637c12b3806345f71f66'


Trivial merge