merge of '302e0ca21f4b6312fd7c254667eb4f20a5601ef6'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 31 Oct 2007 12:05:30 +0000 (12:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 31 Oct 2007 12:05:30 +0000 (12:05 +0000)
     and 'cdb2e28e89c82aad619cd71c60829800e4dd8d0b'


Trivial merge