merge of '12f1208ddddebc7934d98fcac3f803d022a1ba28'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 23 May 2008 14:58:16 +0000 (14:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 23 May 2008 14:58:16 +0000 (14:58 +0000)
     and '8b21a69e52feb768f1d096aa78e44dd20ce3aed4'


Trivial merge