merge of aa6f9aaabdcd4ae0fc3588b296bfb909b1deb0fa
authorKoen Kooi <koen@openembedded.org>
Thu, 27 Apr 2006 15:32:32 +0000 (15:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 27 Apr 2006 15:32:32 +0000 (15:32 +0000)
     and f0eb2ff6d879b69c095726d4650ab88be6b557e4


Trivial merge