merge of '3b34ff5513e03a2208ba8580d3e9b2b9c179f979'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 4 Jul 2008 14:19:24 +0000 (14:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 4 Jul 2008 14:19:24 +0000 (14:19 +0000)
     and '66665e31e0da8709ccf246c100b350c79b36cea5'


Trivial merge