merge of '198a1c8502da246aeea1c3db2cd3085a2722f68c'
authorKoen Kooi <koen@openembedded.org>
Sat, 6 Jan 2007 14:19:34 +0000 (14:19 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 6 Jan 2007 14:19:34 +0000 (14:19 +0000)
commit0a75a00d0f98b748661550cadf899880db89f6fe
tree66fcc4715613d1bd22f545e7f5bcbc27801b1878
parentc4305172c7cfba564d1ad5d537724c9cdf23b530
parent2626ed8f4cc82c04ce6fe4df06a4c1af3e98c90e
Merge ... '198a1c8502da246aeea1c3db2cd3085a2722f68c'
     and '809713f0b5b1318f67dcabcdf56c11ff54d37604'