merge of 36c85029caf52a5bdf60cd12bee0ef045cf0937b
authorKoen Kooi <koen@openembedded.org>
Wed, 3 May 2006 13:49:50 +0000 (13:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 May 2006 13:49:50 +0000 (13:49 +0000)
commitab60b907a46f9d0e55551ae52ad408bb5b278bbf
treed5b13d155856acb55fcd8a65a15fd090602acf61
parentb7e3e75b864c5b8c5ce472203efc8ef5fea26cca
parent1d95c117acc204d97154c7f8a70ec2400d4cbdbb
merge of 36c85029caf52a5bdf60cd12bee0ef045cf0937b
     and 78a66f0dabbef07f6cf0dae7150a8f3cd22f6ebf