merge of 4331fe84e383e44c80f5771143f3f2ab6f522c48
authorKoen Kooi <koen@openembedded.org>
Fri, 3 Mar 2006 17:00:45 +0000 (17:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 3 Mar 2006 17:00:45 +0000 (17:00 +0000)
commit33bcbf5161fd0d6475e0ce44af3344b541d97d51
tree69842ec19c0be329c1a6f22972b4f31e33d876b2
parent1cbf7c36b4c997cf7b9c9ed093f629e6b9e77c7d
parent1e9ccc6c80bd4a2d1add26f3f46e214a5e0b1de8
merge of 4331fe84e383e44c80f5771143f3f2ab6f522c48
     and 78ec2de1cad3328aa990b529ccaa5d719f5efe7a