merge of '3ec01b0a91ae1b235f0cba59ba95f67f6b6f859f'
authorKoen Kooi <koen@openembedded.org>
Fri, 30 Mar 2007 17:49:35 +0000 (17:49 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 30 Mar 2007 17:49:35 +0000 (17:49 +0000)
     and 'ff4cec497cf85d040a1be5d8659847f858cdd4c9'


Trivial merge