merge of '04a1a2e0cc7e9b66f26b0c342d210418c07d6127'
authorKoen Kooi <koen@openembedded.org>
Sun, 18 Feb 2007 11:46:35 +0000 (11:46 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 18 Feb 2007 11:46:35 +0000 (11:46 +0000)
     and '5d9ca4e1f6b8631c921bcc59406fb202e723f586'


Trivial merge