merge of 5920e2fd6b4e15cc5473f6e039f046c31ef6cf93
authorRod Whitby <rod@whitby.id.au>
Sun, 4 Jun 2006 19:56:54 +0000 (19:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 Jun 2006 19:56:54 +0000 (19:56 +0000)
     and fc6d9e156ae82444a86c276b2e4f9f3d67771c36


Trivial merge