merge of '8e5bee62af9b2ba2c2fa97cf2f3253376440235e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 May 2008 13:04:48 +0000 (13:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 May 2008 13:04:48 +0000 (13:04 +0000)
     and 'a10fdcce94239fbbf0aff43c6c367b8b407525ab'


Trivial merge