merge of '9bc9e7c2997572e45f3e497532122978988a6639'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Mar 2007 14:44:41 +0000 (14:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Mar 2007 14:44:41 +0000 (14:44 +0000)
commit9afe535895977c44c960b3b1df5ea347f227bebe
treef7701140da3693e9f9394654b2b1c9b0f10da290
parent9c9e5bcc93e10bdded1460e2bec0117185a708a3
parent26e54152f315fbe47b368fa736afc9f97eb49edd
Merge ... '9bc9e7c2997572e45f3e497532122978988a6639'
     and 'b4e23a53f733c0bb2b846ccec15841140e0290df'