merge of '69edd2665ebcc2300e8bc7e99639c741befd2ec0'
authorKoen Kooi <koen@openembedded.org>
Fri, 2 Mar 2007 16:46:08 +0000 (16:46 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 2 Mar 2007 16:46:08 +0000 (16:46 +0000)
commit2434e5ad46a1e210328cdcc85e3c495de7620f05
tree8e77c325d2513b8c10d919a0c5ffed5bcd48c2fb
parent5988324f397a072f6feec886a803178da822e3f9
parent6a321109c84646b7719c43766df18f5db1f035fc
Merge ... '69edd2665ebcc2300e8bc7e99639c741befd2ec0'
     and 'ecf409702bbbc60edfa91a94b9437b9c1f04fc25'