merge of '344c6bbf6afcb66f847f6131ea545f0960e0599d'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 Mar 2007 17:35:02 +0000 (17:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 Mar 2007 17:35:02 +0000 (17:35 +0000)
     and '88bdc944507d71a314832438ade0d736d55beaf5'


Trivial merge