merge of 0de420be8d89c746c304a8ee1bd19126090ff3df
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Mon, 20 Feb 2006 20:38:04 +0000 (20:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 20 Feb 2006 20:38:04 +0000 (20:38 +0000)
commit281d9196ae77e0e4ce963126c582aec8fe665db9
treec7237d9c16ab3266d4aef4db47a464dc8ce7f2ba
parent1ab39e435c43a66afe6905428c85fda4ce5caf8c
parenta953f708d91b5ec953bcce9eaec0197729891b3e
merge of 0de420be8d89c746c304a8ee1bd19126090ff3df
     and 20f293e2441b5fc0517f4f72f1ef060bd48922c2