merge of '5845bcf9f2b77a412308ab9b7bd6e383f6c902ce'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 14 Oct 2007 08:50:56 +0000 (08:50 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 14 Oct 2007 08:50:56 +0000 (08:50 +0000)
commit953d19644c35cc81587295ad56f68d47b02c7fc0
treeba5e316e1b096254018dcc0d5a682f042ac3f9a7
parent6ab2767ae321ad4f2f5891a7e359fd7273845bd5
parent0120561900199dd3bd20811bdfd66449298f2cfe
Merge ... '5845bcf9f2b77a412308ab9b7bd6e383f6c902ce'
     and 'c761e84668658b2eb7b01e7ff9f0be78c8240e6f'