merge of '0cc400441946f7a721b718fe50f7bbce5c9ea24f'
authorKoen Kooi <koen@openembedded.org>
Wed, 6 Sep 2006 10:37:33 +0000 (10:37 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 6 Sep 2006 10:37:33 +0000 (10:37 +0000)
commit80788791c0a9475d9e2ee6c8f39f283584a7f15c
tree08ed1cd5ccf7d10f7ebb1cbfe98188cd4ed91efb
parentdbae8df533dc665215286adb3d8dfd99085b5d84
parent1b0ec1eeed007033b51b2933905bfb7aa335c2c2
Merge ... '0cc400441946f7a721b718fe50f7bbce5c9ea24f'
     and '42be14012b6790df46c62295f3a02286acecbd4f'