merge of 'ddac71d079db394f27c2b51f7967ea038d63a347'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 7 Dec 2007 16:08:04 +0000 (16:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 7 Dec 2007 16:08:04 +0000 (16:08 +0000)
     and 'f9718212cc877376dcd4cf9ffaf6991c4522d628'


Trivial merge