merge of '0d87f3ceec0d253d684273f4ec3270544b92f192'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Mar 2008 10:00:39 +0000 (10:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Mar 2008 10:00:39 +0000 (10:00 +0000)
     and '67a258d1a15721fbf7bb3dff9040d514a67383c7'


Trivial merge