merge of 'b4b01fb4e8b3ecffccf4533846f88e2458fe7362'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 May 2008 18:57:09 +0000 (18:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 May 2008 18:57:09 +0000 (18:57 +0000)
     and 'ba129bd9e38e74717e81d25413881c72841b72fc'


Trivial merge