merge of 78497884a0df59f27e3276d6961e46c6f09f7eb9
authorPhilipp Zabel <philipp.zabel@gmail.com>
Fri, 14 Jul 2006 12:22:41 +0000 (12:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Jul 2006 12:22:41 +0000 (12:22 +0000)
commit343a8dc59cfd35bc8a30ac898e6644c859d988db
treeca9985d06d15705523af462109ef976a9cf0567e
parentb4fb1a340df59e0db01de9b022ca4697b3d35972
parent0a762671fb1fbd5eb41a5ddfc4b3fa3cbaf09484
merge of 78497884a0df59f27e3276d6961e46c6f09f7eb9
     and bf485b02c3a40cf5e773106c4aff28ebea2e1a2e