merge of 14567c9c4abe3eb73c714bca33a8ecdcf37a5f93
authorRod Whitby <rod@whitby.id.au>
Sat, 12 Nov 2005 08:00:15 +0000 (08:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 12 Nov 2005 08:00:15 +0000 (08:00 +0000)
     and 2fa748703e56caa7448653fa64a00952d5796474


Trivial merge