merge of '5b517db465e78171fe40e917eed17ab8594b1423'
authorKoen Kooi <koen@openembedded.org>
Wed, 13 Sep 2006 21:06:36 +0000 (21:06 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 13 Sep 2006 21:06:36 +0000 (21:06 +0000)
commit4125924de0480c8ed9723fef6825b8bd89528be7
tree103471e1047c73ebc32f4f312d1e3e856988556f
parent83d89572948d158c80e48af9b1e49a44c9894178
parent07ce6a81de0842afe18f25401c39e07391c0885f
Merge ... '5b517db465e78171fe40e917eed17ab8594b1423'
     and 'ffa337dbaac9ce437c92c6e2b6e0d8f6f8186bfc'