merge of '5c1e015a9c8350e90d5a8cdbbb18c5aa06c26f3e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Jun 2007 16:33:12 +0000 (16:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Jun 2007 16:33:12 +0000 (16:33 +0000)
     and 'a88acd45090c2f3297309c6d5f9fcde199868e11'


Trivial merge