merge of '5aa5d42f826b82e5dcae45d30186d8ec6fc7f784'
authorKoen Kooi <koen@openembedded.org>
Tue, 29 Aug 2006 09:07:57 +0000 (09:07 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 29 Aug 2006 09:07:57 +0000 (09:07 +0000)
commit0fec9cdb0716b0a6aac9a4fa806bc5277df5b01b
tree3eb0aad8336ea021c0b0451be3f2f9261d33edd3
parentbb4b9a807fd9ff8a3dc37e26303c805a358f3085
parenta7279a2894397237252dc4274ef6c4c6192780bb
Merge ... '5aa5d42f826b82e5dcae45d30186d8ec6fc7f784'
     and 'c0aaf39c5aa5cccb43a4e2e31affbf6f06a62c4a'