merge of 'a65c738fddaff369abdad3492d66bdf8f6144220'
authorKoen Kooi <koen@openembedded.org>
Fri, 25 Aug 2006 10:22:32 +0000 (10:22 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 25 Aug 2006 10:22:32 +0000 (10:22 +0000)
commit18c800d7eca93e36f914679391a8a7961dad4f8b
tree32fd4642d1bd85065db64169716873e2ffac455a
parent0ef0aaaef45154d538d943c4bcbe340814c72628
parent27db0a385caecaa95baf6406d7a5cc7889d397a0
Merge ... 'a65c738fddaff369abdad3492d66bdf8f6144220'
     and 'c10bc253a7bbce446d6227ef3562f7534d456782'