merge of '7db6bb945fe2a5fda8aa63a3f14cb88e4f63c7ce'
authorKoen Kooi <koen@openembedded.org>
Sat, 2 Dec 2006 12:24:54 +0000 (12:24 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 2 Dec 2006 12:24:54 +0000 (12:24 +0000)
commit06d4c995f7ad6497e55b863e29d6bade1506e590
treeca203bdeda53c4ab56b237439d0f7ebe750d2eed
parentf52988792911e2bcdf408da2dfee1254d9996aa7
parent60cd4e8c450dbdead0beeda6305d02986adf7bef
Merge ... '7db6bb945fe2a5fda8aa63a3f14cb88e4f63c7ce'
     and 'bf07ce72438537e1e952e551bf4bfba3877e3c59'