merge of '9fdf613358c5efcdb75a30ee08729a9e2a7ade08'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 28 Mar 2008 16:04:12 +0000 (16:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 28 Mar 2008 16:04:12 +0000 (16:04 +0000)
     and 'ee2aa51c8eb93fa5579f4cf49a53eb0cb3e90319'


Trivial merge