merge of '6fc0c96303daaec8c718677c1ab7b0cc440ab4be'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 16 Nov 2007 16:54:35 +0000 (16:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 16 Nov 2007 16:54:35 +0000 (16:54 +0000)
     and 'f2599a639a2bce74fd29be0a3fe3b529e9d37493'


Trivial merge