merge of '86aec156c9005ac5b6e746f4efd0249468f7a04e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 Sep 2008 08:54:03 +0000 (08:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 Sep 2008 08:54:03 +0000 (08:54 +0000)
     and 'f09f8f0cf40e82fd7a6a914eb75442c70a3afdc9'


Trivial merge