merge of '1f133cbc99d6821edfd7e22579fd164020999cb9'
authorKoen Kooi <koen@openembedded.org>
Sat, 16 Jun 2007 10:57:15 +0000 (10:57 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 16 Jun 2007 10:57:15 +0000 (10:57 +0000)
commitf857c1379e692764f3f3ac07b6a41e092d51fa2c
tree3483e5d305342a5ff6a91d6644bc74775866b0d7
parent9fcf4d3d9b20aaebad8e20b83a363ea1bba6a5a7
parent95d7d1b283ac30fc2f75d16bbec6438370e124f2
Merge ... '1f133cbc99d6821edfd7e22579fd164020999cb9'
     and '92e57ebaabc8dbb36757843dbe6e0e2bdc042b87'