merge of 096ab2e7684a33253342cb1f15736f6f0b75cfab
authorKoen Kooi <koen@openembedded.org>
Tue, 26 Jul 2005 11:20:07 +0000 (11:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 26 Jul 2005 11:20:07 +0000 (11:20 +0000)
     and 8e8ae9ed5c0f19159a45ee00bbff2a718b591082


Trivial merge