merge of '05fe85ad77e7aace526412ed46891996775f2107'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 14 Feb 2008 09:34:23 +0000 (09:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 14 Feb 2008 09:34:23 +0000 (09:34 +0000)
     and '9f227060931d6ef3c46ac867c9d5ab6f7ff4c7b8'


Trivial merge