merge of 868e3092c931e12c4f9d694ad7df1311a37a82fd
authorRod Whitby <rod@whitby.id.au>
Thu, 13 Apr 2006 13:06:22 +0000 (13:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 13 Apr 2006 13:06:22 +0000 (13:06 +0000)
     and 4813ca2ee55d62f418589078bde8c65471daf1c4


Trivial merge