merge of 'c6c228c0cd2991434c9bb9e2a46ea7de66af8962'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 30 Aug 2007 07:57:38 +0000 (07:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 30 Aug 2007 07:57:38 +0000 (07:57 +0000)
     and 'd0ad1bdf2a54c68b55cdc43378bb68bb835cfe47'


Trivial merge