merge of 681b8acdebf4ff7e7427274b9d5859a0cfb5230c
authorRod Whitby <rod@whitby.id.au>
Tue, 9 Aug 2005 18:08:17 +0000 (18:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 9 Aug 2005 18:08:17 +0000 (18:08 +0000)
commit4c701704d029a1de8698a481c2de814ed4ecb252
tree7a0b49fd8d63d25d9cad6c96c7a10595b295b270
parent54d185acd3d4d949c396b099e809e742f1402a6e
parentff5e3e381f3eaa6eeffc10af9894e64ca98dea07
merge of 681b8acdebf4ff7e7427274b9d5859a0cfb5230c
     and bb0acdc6b3b3e3a264209a9f0094212e7f83e31a