merge of 1892913050b4a9d4204f2fb9202f7cd6d84c0e99
authorKoen Kooi <koen@openembedded.org>
Thu, 25 Aug 2005 12:57:21 +0000 (12:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 25 Aug 2005 12:57:21 +0000 (12:57 +0000)
commitca511b708ffe81ccafa1a195305bfe2807ec08e5
treef75b99e433029d3503c47fdd6e52ec6faf60a4d1
parent39d1dadfed23f6494fa05317a777b16677dae81c
parent1dd3c7936244c3489305fb38f9e8082416428648
merge of 1892913050b4a9d4204f2fb9202f7cd6d84c0e99
     and 4658c406381ad92cb210db3eab6524bb631a717d