merge of '453a4bb82e3f0fcf2f77805ad5681acad8348f96'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 Sep 2008 05:44:50 +0000 (05:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 Sep 2008 05:44:50 +0000 (05:44 +0000)
     and 'cee8584f51540e86bdb701d33f5bc1b282ce0412'


Trivial merge