merge of 5c10855cc5421d8c794fcf79f8086b6983ed1427
authorGraeme Gregory <dp@xora.org.uk>
Fri, 28 Apr 2006 11:03:35 +0000 (11:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 28 Apr 2006 11:03:35 +0000 (11:03 +0000)
commit5e67efef381f4a5a4144cc85d00a920d9d25aeff
tree831a626541897fe08c43322db6f59574d299b72f
parentc638bece8d2c5d85f11a6de29270522440e44d58
parentd630f1b78ce8835e50278346dfcaa2d042b88327
merge of 5c10855cc5421d8c794fcf79f8086b6983ed1427
     and e70ccda5581f1f390d67506c04d6f28f415a67ce