merge of '3bb98c788d34c3b10dae4f9f635695a0e8da61fc'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 18 Mar 2008 16:17:07 +0000 (16:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 18 Mar 2008 16:17:07 +0000 (16:17 +0000)
     and '43c8d115f4121fbba5fab40e9d00365636b9fb62'


Trivial merge