merge of '7b822d191962a6aa7f36fbc3f5fc943962cf04a4'
authorKoen Kooi <koen@openembedded.org>
Mon, 27 Nov 2006 12:46:12 +0000 (12:46 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 27 Nov 2006 12:46:12 +0000 (12:46 +0000)
commit57df117212cda3ea64f33606a8c0cfb7a3d009b4
tree33dd031445fa1ca4c44debf6ee0370cc344a26f7
parent8af94d900dc317ad136659f24ac96f49c6bb516a
parent5a107a715e4ac0fb66c4863e036103a2ec5dbaaa
Merge ... '7b822d191962a6aa7f36fbc3f5fc943962cf04a4'
     and 'b53b3fbf92c1c0c6575e30aa48732b33fab1451b'