merge of '0d10da095e95a24a892ade5cac920039ad878ceb'
authorKoen Kooi <koen@openembedded.org>
Fri, 19 Oct 2007 19:46:09 +0000 (19:46 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 19 Oct 2007 19:46:09 +0000 (19:46 +0000)
commit511be1b8dda622bcb9d4e43559ad9b36c4431f58
treed68c06311179b5fbe68562ebfac9c44987d3c2a8
parentc99842e673f8bc75dfa3d8600fba9970251549ff
parent29643d4a42f6ee5ea1e4381e8cd465e44615287c
Merge ... '0d10da095e95a24a892ade5cac920039ad878ceb'
     and '55a31408b86b4036d83b855bbd46f1b1d7a61765'