merge of '0693b64dbb432d884ac6897aaa6c97de6bc99af3'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 15 Feb 2008 17:28:09 +0000 (17:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 15 Feb 2008 17:28:09 +0000 (17:28 +0000)
     and '706ca8a56360cf090b26c74d6dc02843def49575'


Trivial merge