merge of '87b49518bcc5300a395daeb3510b7801f333eda9'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 26 Apr 2007 12:46:33 +0000 (12:46 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 26 Apr 2007 12:46:33 +0000 (12:46 +0000)
commit5704436996d7e0ca4d058bc309f642d950f00956
tree9e25d0d83833e637e0ba4e04fc96dd8c91bef391
parente83c087db9e90da91b3b7c9d4fc14915f4c36ee9
parente085d81e48df8bdeec11ff552245a40dfa008889
Merge ... '87b49518bcc5300a395daeb3510b7801f333eda9'
     and 'ba162bf6372784bad9177dc8a7fa8a66c9e665c4'