merge of '66901d5eabd98c5f7c2f9cdf809e9fe7f182f1ef'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 25 Jul 2008 11:51:44 +0000 (11:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 25 Jul 2008 11:51:44 +0000 (11:51 +0000)
     and '8a68b62f9b7e2ae09097a8b9390d75dbcfc1ca82'


Trivial merge