merge of '4d1e9bbb686a5e2a7c5226ac3d7ac5db4cde3d50'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Mar 2008 11:29:29 +0000 (11:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Mar 2008 11:29:29 +0000 (11:29 +0000)
     and '7df63fef3f3ba5852f623653d668b6eb659f0cd7'


Trivial merge