merge of 224e3cbcf014b8cd9406d30cb74a19c2d77cd5d6
authorRichard Purdie <rpurdie@rpsys.net>
Sat, 6 May 2006 17:53:07 +0000 (17:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 6 May 2006 17:53:07 +0000 (17:53 +0000)
     and 253cbfe06dd468b449fb7cf63f7d91224be6c3d1


Trivial merge