merge of d24be3dd6b15a4f285a8f5b7d8ef9311f719b301
authorRod Whitby <rod@whitby.id.au>
Tue, 2 Aug 2005 06:45:34 +0000 (06:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 2 Aug 2005 06:45:34 +0000 (06:45 +0000)
     and ee2a6db8532b8347f6c34f21d110e391622d3380


Trivial merge