merge of '66db83630ba1bf253d3e2c23e104ba40c0836d50'
authorKoen Kooi <koen@openembedded.org>
Thu, 15 Feb 2007 08:01:49 +0000 (08:01 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 15 Feb 2007 08:01:49 +0000 (08:01 +0000)
commit43d01031bf1203eb3c48b5655e1deb24f06496a4
tree2aa86d56c1aeaf12cbd38b5522030f90e274f358
parent24706b06126fba0c1bb39edcc76e80e2e9244b2e
parent88603a6cc920c4e7c6a66e52af36de47b7357ebc
Merge ... '66db83630ba1bf253d3e2c23e104ba40c0836d50'
     and 'c2de20613cc1dd7b1ae71b370f12d3dcd41d3b7e'