merge of '3664c8386a83989b0e4b61c25a0c3f5782c2b71f'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 26 Oct 2007 13:20:39 +0000 (13:20 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 26 Oct 2007 13:20:39 +0000 (13:20 +0000)
commit918240fb5a1768cabb55ea7e682ef8e45ba52953
tree926264867629a46c5ce1629e2a17298e1a01a77c
parent36e79486430fe871d35fc062242831aa0f47126a
parent09c900ed8e2b3fb788649e5836a7b0997bb90dfd
Merge ... '3664c8386a83989b0e4b61c25a0c3f5782c2b71f'
     and 'b968656776ab23ced6e8710b760e509bfc537fe1'