merge of '5b5a99c95ab4ee23e5e5c0460ba6744420c75edb'
authorKoen Kooi <koen@openembedded.org>
Wed, 23 Jan 2008 17:26:49 +0000 (17:26 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 23 Jan 2008 17:26:49 +0000 (17:26 +0000)
     and '84d6e8f79077a6afd15b7c4d1b4260dba2fc07e6'


Trivial merge