merge of 0bfafb15be028004cf9117bd99c73c9f7ee1b3c8
authorRod Whitby <rod@whitby.id.au>
Thu, 11 Aug 2005 10:12:01 +0000 (10:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 11 Aug 2005 10:12:01 +0000 (10:12 +0000)
     and 154b18293551ae7140a0552c72791f095d1f3f69


Trivial merge