merge of '3cf32549009f589b1377cd2d4c4d70ffb05e7a3e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 1 Aug 2007 08:28:51 +0000 (08:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 1 Aug 2007 08:28:51 +0000 (08:28 +0000)
     and '9c859a543fc786163facf04e76c3bee8ee994486'


Trivial merge