merge of '3a33174c6fa66a880c209e2c329c44ccbc664a0b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 8 Jan 2007 00:20:33 +0000 (00:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 8 Jan 2007 00:20:33 +0000 (00:20 +0000)
     and '9f8a39fa34d7257f597bf4ca8e99a108275f6d3f'


Trivial merge