merge of '062ebbe44379bc5a91c32a65954e729d5496ff44'
authorKoen Kooi <koen@openembedded.org>
Thu, 18 Jan 2007 17:19:08 +0000 (17:19 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 18 Jan 2007 17:19:08 +0000 (17:19 +0000)
commit4f455821e7b65446d38a375299d0da9a4d523e50
tree6af52be900fae3250b2438654b4322616f114315
parentafedbcc9bf94a0143e3b7b41fe59aa79d5788300
parentd4b30eead2ae8953efc97048336cb2f6c49aaa2e
Merge ... '062ebbe44379bc5a91c32a65954e729d5496ff44'
     and '30c4d8712344f77f9ae6637c12b3806345f71f66'