merge of '09f0e748099ead0977ce917225e137b0a7d363ff'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 Feb 2007 07:25:32 +0000 (07:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 Feb 2007 07:25:32 +0000 (07:25 +0000)
commit24706b06126fba0c1bb39edcc76e80e2e9244b2e
treee293871e344979ae989e849a233b1473aaf51531
parent154641298d7cb2c336bc6a5a38e51d9f7e14abc2
parent2555e03ec4371f13f8d8101934d17696bc91027a
Merge ... '09f0e748099ead0977ce917225e137b0a7d363ff'
     and 'cf75b3ea7e747b76ea3fa7398a6b401e1df0bfa6'