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)
commitdd9700214e77892429bc30bee41fcdd846471fcc
tree534c84b781f9252f91c78e015bc2387eeaae0c6c
parentabb6051c92ff3031c2c83fea909f95b5f2356c23
parent6b1efd1aa136320f3684af30c98962209b5353db
Merge ... '8e5bee62af9b2ba2c2fa97cf2f3253376440235e'
     and 'a10fdcce94239fbbf0aff43c6c367b8b407525ab'