merge of '21f4ee6d8fb062180d2dc43b1e650ead520ca0a9'
authorKoen Kooi <koen@openembedded.org>
Fri, 2 Mar 2007 16:42:24 +0000 (16:42 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 2 Mar 2007 16:42:24 +0000 (16:42 +0000)
commit5988324f397a072f6feec886a803178da822e3f9
treef4da35bcf915496828f75c4021588020bc6b7c90
parent2cbdc6cd12a4f3e756c10c71049086b7ea66561b
parent3df911cf4b9fa4d871ef96e7d9f61a50c6890fbe
Merge ... '21f4ee6d8fb062180d2dc43b1e650ead520ca0a9'
     and '449ea8e45f6398be01dd6f681846b2c1f8a10c67'