merge of 21252c4c7a5910613b4ad8bb14547acc75ca2816
authorRod Whitby <rod@whitby.id.au>
Mon, 25 Jul 2005 14:28:22 +0000 (14:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 25 Jul 2005 14:28:22 +0000 (14:28 +0000)
     and 74528064f70361f71c59f05cc945b3e6dc157aaf


Trivial merge