merge of '2188b65d5983b40b225a0a4b0a1289b46ad95717'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Mar 2007 15:39:16 +0000 (15:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Mar 2007 15:39:16 +0000 (15:39 +0000)
     and '4c365b71ab58cf8ea1b693388693139aebeaabab'


Trivial merge