merge of 'cc5142241e1e0788b16bdb07718b289a105ae7ba'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 11 Jun 2008 16:30:20 +0000 (16:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 11 Jun 2008 16:30:20 +0000 (16:30 +0000)
     and 'd9b88c514f27c48820b33f83a95c33539f78dddb'


Trivial merge