merge of '47d8716628e5ee3a0fef6d31d3681973db6b3804'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Mar 2007 20:05:54 +0000 (20:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Mar 2007 20:05:54 +0000 (20:05 +0000)
     and 'e90fcecaeb0ae2bcd7a98403ba936753625f59bd'


Trivial merge