merge of '5dde2d982b4415230cf4fcc1095f4a732837813a'
authorKoen Kooi <koen@openembedded.org>
Sat, 2 Aug 2008 16:56:19 +0000 (16:56 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 2 Aug 2008 16:56:19 +0000 (16:56 +0000)
commit73a904e7583df04f08458005afe462b60f8c006e
treed802deee86da7fccb7d1ddb98f749cf4cb1338d6
parent42a2daf8669e6c2229c8880e0cc80a1a26f66e81
parentcd03b0435ea8f96b9487c8e6ee58253b3e593c2b
Merge ... '5dde2d982b4415230cf4fcc1095f4a732837813a'
     and 'e546707be8f44437449d19908d966d7a62798618'