merge of '02f0d5fddf858a7c968f6aa8a0733e64c373840d'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 29 Dec 2006 20:31:29 +0000 (20:31 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 29 Dec 2006 20:31:29 +0000 (20:31 +0000)
commit8c1d184779b8caa122e2fde66077a99aed915309
treebda3576c9743ecfd89d4b9b13263514094b3b241
parent095d2f2f4a11a28edf7dfdc2d80d31695db479f8
parent11c9232d1e801cc40e1c295e20c1a4baf483822d
Merge ... '02f0d5fddf858a7c968f6aa8a0733e64c373840d'
     and '8b3597c2174798b0e22b0c752ade70a447dd991a'