merge of 97de95204fec3ff071576bb50a8f5806ef61b060
authorRod Whitby <rod@whitby.id.au>
Mon, 5 Sep 2005 14:03:50 +0000 (14:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 Sep 2005 14:03:50 +0000 (14:03 +0000)
     and d63c6ca7a0fdf35aeb7c989f1f0ae41798aa3b1f


Trivial merge