merge of 4ed4d06c5ea603aeb65c4f23220d3a64c7e917c8
authorKoen Kooi <koen@openembedded.org>
Sat, 15 Apr 2006 21:52:32 +0000 (21:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 15 Apr 2006 21:52:32 +0000 (21:52 +0000)
commit40bf9704a45c7ea1a34e2d698f76edebb8b40e5e
tree45bc746dd6e5fc28c5d3718e07d1f280129e8ec8
parentc186ea4254b4440e2a782ae41de89b2fc0e35cf4
parent2713e8179069f94f347b33ec2a267b5a4102b7c9
merge of 4ed4d06c5ea603aeb65c4f23220d3a64c7e917c8
     and 8c18de8e683dcd5c02a273e3df84472d13182c02