merge of '2f6a75703ff201034fac5c3a14baf261f8eb2b94'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 3 Aug 2007 13:09:40 +0000 (13:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 3 Aug 2007 13:09:40 +0000 (13:09 +0000)
     and '6e404b0729a59d47868eceeec95ed68998b51090'


Trivial merge