merge of 35381e2f28108843e0f9b4730ba70e7a3a763056
authorRod Whitby <rod@whitby.id.au>
Tue, 1 Nov 2005 13:01:46 +0000 (13:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 1 Nov 2005 13:01:46 +0000 (13:01 +0000)
     and eb8f26d3b2c8dc452c684af8fbc595b6ed6061fe


Trivial merge