merge of '2188b65d5983b40b225a0a4b0a1289b46ad95717'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Mar 2007 15:39:16 +0000 (15:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Mar 2007 15:39:16 +0000 (15:39 +0000)
commitef870450ab6c3d30a7455e19b7552e7ae1d702b2
treeb605aaa2dd2773887a4ec111ac99f48dd2df3205
parent01f88920ce441e6532d4264b7903492093f90d4f
parent036c369555a1f576bb9ebf4bbe960427221bb563
Merge ... '2188b65d5983b40b225a0a4b0a1289b46ad95717'
     and '4c365b71ab58cf8ea1b693388693139aebeaabab'