merge of 'c46c002524d0be121054c2e92ba2e12db4571442'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 28 May 2008 23:57:48 +0000 (23:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 28 May 2008 23:57:48 +0000 (23:57 +0000)
     and 'fa394e594a7df67376061a20e296005fc9068aff'


Trivial merge