merge of 1133a2f6d7624f04cdda9771f28e1502680e7213
authorRod Whitby <rod@whitby.id.au>
Mon, 6 Feb 2006 00:46:35 +0000 (00:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 6 Feb 2006 00:46:35 +0000 (00:46 +0000)
     and 59438d13db19ded8e22646fb8cddf849804f3a90


Trivial merge