merge of '752a299fb6dac3f47f04ff23bc60eb3cbf0fcc44'
authorKoen Kooi <koen@openembedded.org>
Wed, 13 Jun 2007 08:34:04 +0000 (08:34 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 13 Jun 2007 08:34:04 +0000 (08:34 +0000)
commit26eeb940ac198c37fa32fe98edadbeca15e8be6b
treebed590f8439a4481079624ac8ad577230263978d
parent7cfcf500327b4def8a4485bb53850961ec096202
parent339c032ea9a177b184eb78d984835ae440cc8b56
Merge ... '752a299fb6dac3f47f04ff23bc60eb3cbf0fcc44'
     and '8119e9385c70c493e4f797e81537765d2dd31127'