merge of 681b8acdebf4ff7e7427274b9d5859a0cfb5230c
authorRod Whitby <rod@whitby.id.au>
Tue, 9 Aug 2005 18:08:17 +0000 (18:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 9 Aug 2005 18:08:17 +0000 (18:08 +0000)
     and bb0acdc6b3b3e3a264209a9f0094212e7f83e31a


Trivial merge