merge of '6f164d924ef877e9361c0f48667e2ef44a9addcc'
authorKoen Kooi <koen@openembedded.org>
Wed, 10 Oct 2007 08:57:19 +0000 (08:57 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 10 Oct 2007 08:57:19 +0000 (08:57 +0000)
commit2eb5a3d80018bcfb02586f03f22745d50e327547
tree3a9b92d1fac6128384ddc67096a602c3a785b1fd
parent1cb6e2bfb728dd8a04244c1bcac8b1a502faac3a
parent7cd1f1a619ec4e88523e2ed850495ef1b616e415
Merge ... '6f164d924ef877e9361c0f48667e2ef44a9addcc'
     and 'ada2b5e6f0e360127442cd1510cd4740e48a91e8'