merge of ae422df79b5b9f0a401e9a4e9ae694ece441d33e
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 23 May 2006 09:02:18 +0000 (09:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 23 May 2006 09:02:18 +0000 (09:02 +0000)
commitb1080b90c5735a7a28cafe57659544a8518f57c1
treec3c30cc074fc01002c31c5e31a631578dce704ff
parentb2b279135a4934b02da70e72037aeaf5af95478b
parentfaa5934ae5ef894345ab58cfc86bca2822e6da8d
merge of ae422df79b5b9f0a401e9a4e9ae694ece441d33e
     and f3fea5653b417f0d915e521ea668b6fbf17851df