merge of '696fafb88835f59c6692b229e898775cd7a46691'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 2 Apr 2007 09:58:18 +0000 (09:58 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 2 Apr 2007 09:58:18 +0000 (09:58 +0000)
commit04cf366f5e4eadee5f64f657f07a3cfa6986531f
tree3adb896fa379db6786a172a4743e8c6552642023
parentd87a9afac7ab32ceae125d1359872c0f75a0a530
parente38a18db6365267bcf816b0fcf68a7f0d0890423
Merge ... '696fafb88835f59c6692b229e898775cd7a46691'
     and 'b3b8e63b9c7a291ec7420fbeb711be2b70875547'