merge of '1054ca4965286d532ebc6789997a44625d410958'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 30 Mar 2007 16:50:57 +0000 (16:50 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 30 Mar 2007 16:50:57 +0000 (16:50 +0000)
commit621811d946e0ae7d5b0b8069192c8b13b53dcbfa
tree01f7d8c0d1a71390cd44740695b7fd080129a95e
parent0d34dd4e5c2135f24cdf7533b96f05c87d93a843
parent5c15ba55b0f04c46103fe564bb9b732b783578b9
Merge ... '1054ca4965286d532ebc6789997a44625d410958'
     and '40243c3b0cc351c447c35cf09151051adc2d657a'