merge of 'ba1952e77d8317a620918dafd4d7de027e092e7d'
authorKoen Kooi <koen@openembedded.org>
Thu, 24 Aug 2006 12:02:10 +0000 (12:02 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 24 Aug 2006 12:02:10 +0000 (12:02 +0000)
commite8e509c13e2a4473bb43052ac90c0af20c9d4c4a
tree6b8f2c480a7539b0f97c3fa6f350ae8569b84a90
parentbe99a6b3f42e9842343750845bda7471a6e4807e
parente9608f75362acabb2f3769259daaaa5872894c1d
Merge ... 'ba1952e77d8317a620918dafd4d7de027e092e7d'
     and 'e8b7b3d17794e7d13096074a170b245f63ac7e95'