merge of '6eab8aa968a601fef1ab31a6236358e693096ae9'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 25 Oct 2007 11:38:25 +0000 (11:38 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 25 Oct 2007 11:38:25 +0000 (11:38 +0000)
commit8926ba9a4718a4d232c24ccaeea61007f422de12
tree8680cf8281b29dc39cca200e147109cdd177a337
parentfd0a67a7553da6cb524c08b7aea3f5cd809a5381
parentc3445a98ef55b6c5ad40df1894a020836da71154
Merge ... '6eab8aa968a601fef1ab31a6236358e693096ae9'
     and 'dc8de3e0e3155524f86e2184b5e33f5944fdbcc3'