merge of '7bdad48271a5cd7e452da1e8a7fff502ce18c8d7'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Mar 2007 14:29:44 +0000 (14:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Mar 2007 14:29:44 +0000 (14:29 +0000)
     and 'eca2cd6dec5347a592e5ea0f4a5aace6c7e206bb'


Trivial merge