merge of '08286eac244da750fe999831d31e71eb0acd01d0'
authorKoen Kooi <koen@openembedded.org>
Fri, 8 Jun 2007 09:22:21 +0000 (09:22 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 8 Jun 2007 09:22:21 +0000 (09:22 +0000)
commitdb921e15b14392d6c46ac8a99fff5be1b871a400
treec3b4f9d3298a07b6c30980a13b79c95fe9bf569d
parent2db0e90877bbd9b138ef8f9c5947a07ebb0e52fb
parenteef61d7e58dc25e778373cbc959ba58a97c70b4d
Merge ... '08286eac244da750fe999831d31e71eb0acd01d0'
     and '61fb94a908eb11cc06b5c0d937667da64fcc801a'