merge of '5c07880b5834b7705ca79c09053c32f9161e0aeb'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jun 2007 13:07:51 +0000 (13:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jun 2007 13:07:51 +0000 (13:07 +0000)
     and 'f76780cf5858e364ec4d16a3a725b62bad681348'


Trivial merge