merge of '4f2b8fbe38be5a535656d7d00413d303f9a4975d'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 1 Oct 2008 18:30:22 +0000 (18:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 1 Oct 2008 18:30:22 +0000 (18:30 +0000)
     and 'd3b1203776970588892a46acdd9df1e18c0c5d37'


Trivial merge