merge of '59341f601c1006b473e6599023cd3870fec6ff99'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 22 Feb 2007 15:19:49 +0000 (15:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 22 Feb 2007 15:19:49 +0000 (15:19 +0000)
     and '7b8ecf841cab8930e619a7d8366b45d045d72c16'


Trivial merge