merge of '1bd825374fa13ede0bf18088241b5f6082e92e36'
authorKoen Kooi <koen@openembedded.org>
Sat, 11 Aug 2007 10:46:52 +0000 (10:46 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 11 Aug 2007 10:46:52 +0000 (10:46 +0000)
     and 'e7f9cc8373c592db0fd5e595010f3aaf8a3b0890'


Trivial merge