merge of '2f874ef26d3d188bdba338d64271407ff2d178e5'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 19:20:44 +0000 (19:20 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 19:20:44 +0000 (19:20 +0000)
commit230e3196d08fab797e44c5c6a63a2fda47de5ed4
tree78204f77c35171dc1d6f7784f6218de19ae4b8c0
parenta50e75564f2c89a186770a0f5a7176ea32a382de
parent668c127e98c2327f4e715192b0b8e893d4987c96
Merge ... '2f874ef26d3d188bdba338d64271407ff2d178e5'
     and '5e009cc3f1463fd909ab544e5d857738234928ba'