merge of '343be32549619f9cdde460a045b0592d3af6ddb0'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 21 Aug 2007 20:41:21 +0000 (20:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 21 Aug 2007 20:41:21 +0000 (20:41 +0000)
     and '486b98349c864712c681885da1a19351dd230534'


Trivial merge