merge of 93a7ad23db8afae5e3440a5866caf7bf2f8ee416
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 18 May 2006 14:07:53 +0000 (14:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 18 May 2006 14:07:53 +0000 (14:07 +0000)
commit7ca069ac771dc3766441e0f3e17b85d7244bc8f6
tree8f75063f4b5c537026aadd05d866b6d32c031673
parent30ae70170fb606b4468bcad87e879e075ec90177
parent1dfe6a3d89e15e0f8bb09570ec7e887a948d86b9
merge of 93a7ad23db8afae5e3440a5866caf7bf2f8ee416
     and b2ab0fa552043211df9ed0b809ba28541d552bec