merge of '4f5beacbe7b1e42fd9aef1829880d4574a224107'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 12 Sep 2007 08:04:06 +0000 (08:04 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 12 Sep 2007 08:04:06 +0000 (08:04 +0000)
commit12eb34bbe3b000713a8a52be0b910175360460ff
tree120ca10ffd4dedc7d11e363fe89d98bb69ba931f
parent36a83a5d1717f0d7631a3a18bac760727cb35e18
parentfd63e725503e69f54142fb8cfbda73da59cac1dd
Merge ... '4f5beacbe7b1e42fd9aef1829880d4574a224107'
     and '858d3619107d3639eb7f4513780cd6c650e0741d'