merge of '1415f8fe0c4b15b7c24e2f8492c219ba906af8fd'
authorKoen Kooi <koen@openembedded.org>
Thu, 10 Aug 2006 14:44:21 +0000 (14:44 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 10 Aug 2006 14:44:21 +0000 (14:44 +0000)
commit8e81b91edd924e67e3df7136b54a46183e8bd983
treefccc426f51b3c0fc56cad3fe4302fb5c37531f01
parentb6ae0a23930463751118b578a37e11122bbab289
parentb99c102029cfaaf07aa79eeed43a3d7068bd48b9
Merge ... '1415f8fe0c4b15b7c24e2f8492c219ba906af8fd'
     and '871b52cc6f79e8ed85515aeaa65ff9cb0cd40bfa'