merge of '0530cbc2e708bd334c3cfce29e493b23ac334eae'
authorKoen Kooi <koen@openembedded.org>
Thu, 29 Mar 2007 11:50:53 +0000 (11:50 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 29 Mar 2007 11:50:53 +0000 (11:50 +0000)
commit59fda25ab6c5091f0f4fd462f54a4555d5f9faf1
treebe2b626dfc85a32c6506527935d1a568d40719ac
parent0f58092c991ced1629b1b30bd08e2ea823d46c8d
parentd1dd8f567b4f6cb983d8a81e34e4ec2d56337eef
Merge ... '0530cbc2e708bd334c3cfce29e493b23ac334eae'
     and 'b29c23e0d633fa6ee3a025145df31e696fcc3cd3'