merge of 4ea020353f2312e619cfed7b9c2ae9d32b71012d
authorRod Whitby <rod@whitby.id.au>
Mon, 6 Feb 2006 03:17:07 +0000 (03:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 6 Feb 2006 03:17:07 +0000 (03:17 +0000)
     and ad980e031ab94ad3b8f2d1e29f2bbae35f47d710


Trivial merge