merge of 26c7aa9a5e1ee433e5f5ee59307c1840d2e0658e
authorRichard Purdie <rpurdie@rpsys.net>
Wed, 3 Aug 2005 08:25:37 +0000 (08:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 Aug 2005 08:25:37 +0000 (08:25 +0000)
     and ef346e4f39975933d42031cb6e4b7d2b9656e9e7


Trivial merge