merge of '59f75bdc33171d30c812abb8da6d9bfb4c9aed68'
authorKoen Kooi <koen@openembedded.org>
Thu, 1 Mar 2007 10:50:49 +0000 (10:50 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 1 Mar 2007 10:50:49 +0000 (10:50 +0000)
commita3864d9386ed5b4775cb7a20b98b23f51d0ca71c
treee82f527b79251007217c2fab62ef3c25b60ea05c
parent8367928d65feb159abac0c9099f967aa9ac10060
parentcddde63765566348b7eb6f1998a8dc4705a1c8b5
Merge ... '59f75bdc33171d30c812abb8da6d9bfb4c9aed68'
     and 'ef143b9e79670f22adae297b18184da3cf9c8769'