merge of 'a3ceb2efe11ba0ea4109c98e325782ecb5291f36'
authorKoen Kooi <koen@openembedded.org>
Thu, 25 Sep 2008 18:58:21 +0000 (18:58 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 25 Sep 2008 18:58:21 +0000 (18:58 +0000)
commite105788b0a726ba747a8e9b4b9701f3fc702cab6
tree93ea19928715467826ed780e9dd71751ba79e107
parentbfa1b90eda6a0ae80d4660e506c20ca45d2bc858
parent5e2f657d944dbd295db4a7a5546e6de74db3674f
Merge ... 'a3ceb2efe11ba0ea4109c98e325782ecb5291f36'
     and 'e474c45d11742eae32d0f0be8f321dd5a162f101'