merge of '6794aa0dd1ca646be71cc57651a883ac99f55985'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 11 Jan 2008 08:37:43 +0000 (08:37 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 11 Jan 2008 08:37:43 +0000 (08:37 +0000)
commitca878cece7ccbde0bd83487aad91cf13922d6fb2
tree664d893a47913547065e0d8684548ba7de3d2aa5
parent4298ad67f59c242f7d3e79773455e9503a06e367
parent457fc3b7f778bbf2a60a2925e3de26dbdbe2d735
Merge ... '6794aa0dd1ca646be71cc57651a883ac99f55985'
     and '7775497ff0c2687b47560d82fd34535a0952beac'