merge of '6ecc6574ba0db38196a290448aaaf3706bcacee3'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 5 Jul 2007 16:21:53 +0000 (16:21 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 5 Jul 2007 16:21:53 +0000 (16:21 +0000)
commit8d3f7b27e80ba08d2dc0e8167f01d27527697e06
treeb1fa703042aa93dc9aaa90df0695211de7d9e807
parentb0dc3a8d1dc7e79b7960ee7503d80a7d43b8793f
parent2ed2875b6c56be3a2f2b9db557e22024d3e92dd6
Merge ... '6ecc6574ba0db38196a290448aaaf3706bcacee3'
     and '7314baf01ff720449ddb034e256e260501df588f'