merge of '05e24f5610763d569f2c11c8f26e2152e34063bb'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 12 Apr 2007 13:14:14 +0000 (13:14 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 12 Apr 2007 13:14:14 +0000 (13:14 +0000)
commit3524b34212fdab21c6882324b85efcc65dd6238c
tree1214a0b6b12a6e6e243abf6d27db52d56530bc45
parent8bf985a982ad37e55af7fce9f9fbc284a202e93a
parentd591b320402f2069960fe1bc5f50d96e1b01efb0
Merge ... '05e24f5610763d569f2c11c8f26e2152e34063bb'
     and 'fc25101f37442915e9b2899a4383cb5bb412b44f'