merge of '57b770a7023dbcdb2b9d6d1a19890a743793d79c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 2 Jun 2008 09:08:01 +0000 (09:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 2 Jun 2008 09:08:01 +0000 (09:08 +0000)
commitbad171746b87ee785e259c8163ebd14221b13a8f
tree534b1222dbba8210e849bb2ae741adea8f7da73e
parent63301a3e3ef8249810c54db7f1fb2ada99cd55bb
parentc61fc95d2deb7924357f73ef1cd4b42bba956376
Merge ... '57b770a7023dbcdb2b9d6d1a19890a743793d79c'
     and 'a6a18f676265371134e8944deb4be3fa0724a352'