merge of 30c43de0d10703530b40f3820110767c65fc2a3b
authorKoen Kooi <koen@openembedded.org>
Fri, 9 Dec 2005 09:33:24 +0000 (09:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 Dec 2005 09:33:24 +0000 (09:33 +0000)
commit4955af976909a19c43dfa16e8ad63425bacb0992
tree6f23117bb14b2a1add09dd90b2d8e455e2b69b83
parentb71bbc4ea1cb37fddb98000dd92837b80f1db278
parent77c2adc046dcb2841bffa98a8a5474db8441f7ae
merge of 30c43de0d10703530b40f3820110767c65fc2a3b
     and d510fe2c093aff12bc3223326057244c800701ad