merge of '44b48a8021a29d930331e47aac526ec54edead5a'
authorKoen Kooi <koen@openembedded.org>
Sun, 4 Feb 2007 10:10:26 +0000 (10:10 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 4 Feb 2007 10:10:26 +0000 (10:10 +0000)
commitde74f5cf67da45f61cf5dcd0d549bed0cfddf768
treed5cc845f9154ab5688201b4f8160be938c743cfe
parent8b93aed08f519bf4b6a27c9f82558c86b2db39bf
parent6fe2be1e2d3f8dbce020a5a3e31f84e2a368254c
Merge ... '44b48a8021a29d930331e47aac526ec54edead5a'
     and 'bffe15342c6408775c27ead21d1b984c196c3373'