merge of 0c68cd9f7176bca16daf6bc374bbe0adcb6f7736
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Wed, 28 Jun 2006 15:11:34 +0000 (15:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 28 Jun 2006 15:11:34 +0000 (15:11 +0000)
commitf8c3fadf79c2e3d84dcff874719984ea6f3a4450
tree1ce65e0e38fbe406a38a3c1ce2c6356c5085ded5
parent57d8d19e4c48be55bf0cdfffd85ca89a8d8a2bf4
parent9943bed1ee00a137de0b3ae9d30abe4a63ce5d82
merge of 0c68cd9f7176bca16daf6bc374bbe0adcb6f7736
     and 9e7bb196edb79eecad7d7ed9e5be82a0489356f6