merge of '38e38f27d81c78058d1cfa4e57d5cf1c52981c7e'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 12 Jun 2007 06:35:37 +0000 (06:35 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 12 Jun 2007 06:35:37 +0000 (06:35 +0000)
commit116c736d147da541e23b10dbfe8f464f3527c0ab
tree4145fa80c3cdfbbfe146b9641f5943f238962b99
parent030cc02fe68b647c7476996c65bb3f6ed6327eee
parent54ed40fe0a867be355e1035633a1023911baa14a
Merge ... '38e38f27d81c78058d1cfa4e57d5cf1c52981c7e'
     and 'e3ec97ab62819c73e0116db91b2b7b2cb5a52ce6'