merge of '35aebfd326db9a760b6780522db0fec6ba37781e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Sep 2008 14:02:27 +0000 (14:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Sep 2008 14:02:27 +0000 (14:02 +0000)
     and '5a665541f42d3268c0c49b55db2235a9f910a7c3'


Trivial merge