merge of 'ad84690ef54c978b3fd21e3ff2283954120c9df2'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 30 Apr 2008 10:27:26 +0000 (10:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 30 Apr 2008 10:27:26 +0000 (10:27 +0000)
     and 'f5044968cbc23730cf02b860f0c615b6f1664d4e'


Trivial merge