merge of '105955293719b2a1414f1b03af410b8ff8dbdb1b'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 7 Dec 2007 10:59:34 +0000 (10:59 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 7 Dec 2007 10:59:34 +0000 (10:59 +0000)
commit3aefe52f532d621bfad7109bb8f03bcbc32833dd
tree84e742e65c5a39438299049ae449b39a9761b2c7
parentc16ea23180e220831092ed326a3cfdf79517fd59
parent9c849fd6aaccbfb3a76e81e4dbcc20f09479e984
Merge ... '105955293719b2a1414f1b03af410b8ff8dbdb1b'
     and 'c238596b6479864883292d3fa663a0cfd751e5a6'