merge of '2d0e7ded96559d4c71de1153762dd0879fa16697'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 16 Jun 2008 12:11:59 +0000 (12:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 16 Jun 2008 12:11:59 +0000 (12:11 +0000)
commitff137d12389e8c9b049fd50adcd34eb0f3c741dd
tree3c319e6b53805d10d52c507eaf9cb735a4dee34b
parent634587a767fb53908d80bb6ec4bf62f0d80165c1
parentc20c7a7d0f78509baa050dee3e7a2281d378858c
Merge ... '2d0e7ded96559d4c71de1153762dd0879fa16697'
     and '3b0348e0f932d88b5a93caf068cae7af759a6339'