merge of '48b3ebe818c6d71c00ae88870e198d7a6aaab977'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 4 Jun 2007 13:22:58 +0000 (13:22 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 4 Jun 2007 13:22:58 +0000 (13:22 +0000)
commitea1474fe9f594fd60befec842774c13ee96a2931
tree9b8eb4873699e71d9fb4f5cb588324974043bc8a
parent13a53f907ae420b82bd21614bdb5ebe71fe5cdaf
parenta504c01c9a8305ed1bbce948a4ccb4208f7fb543
Merge ... '48b3ebe818c6d71c00ae88870e198d7a6aaab977'
     and '9601d0f2fa6ac50e61ab50e4be9e17b571aad3f0'