merge of '0c748e1d7bac1a47ec910c7acdb38a694ca28999'
authorKoen Kooi <koen@openembedded.org>
Sat, 11 Nov 2006 20:32:53 +0000 (20:32 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 11 Nov 2006 20:32:53 +0000 (20:32 +0000)
commit3365c434187111a1e173d0d1aa7d59be50fe71ae
treefcddebb683cf0d292a72c7b7b5c9051774311824
parentc96e2bdacc17e026911a75b207fbad39b4b5dd17
parent446553e3d9f4f67edd09463954bbfa2582b72a8f
Merge ... '0c748e1d7bac1a47ec910c7acdb38a694ca28999'
     and '2514e90184801c096284ce7869e8eb95ddf3a9db'