merge of '2e6d644fadaae847990c7d7a30bff1ecfd9e4552'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 2 Aug 2007 14:02:37 +0000 (14:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 2 Aug 2007 14:02:37 +0000 (14:02 +0000)
     and '476213006a461377315575c2cc2ff379fb8099f8'


Trivial merge