merge of '421f0e4f9d6c592d160a826be5537441f095bec7'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 3 Jul 2008 20:35:47 +0000 (20:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 3 Jul 2008 20:35:47 +0000 (20:35 +0000)
     and '8c8d9512a1c377169fe0bc4cfe411d74aa9e22a1'


Trivial merge