merge of 59a26e4bc6be5d4a3bf6f7604ed3be4c535d7ced
authorRod Whitby <rod@whitby.id.au>
Tue, 10 Jan 2006 10:00:22 +0000 (10:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 10 Jan 2006 10:00:22 +0000 (10:00 +0000)
     and eecdb83ac8464beff7f6584c6e739f30ba91e43d


Trivial merge