merge of '594502154668fa56bb9d345ec049a78e7e0e759c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 27 Jun 2008 16:57:37 +0000 (16:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 27 Jun 2008 16:57:37 +0000 (16:57 +0000)
     and '6acddf364e7286f03e9e90e9d79ea91cfff7b282'


Trivial merge