merge of '8c0681c145743970130cbe62da92b45f76b3c4b5'
authorKoen Kooi <koen@openembedded.org>
Thu, 15 May 2008 17:14:02 +0000 (17:14 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 15 May 2008 17:14:02 +0000 (17:14 +0000)
commit1da46e43114e8fea06d3d08f9bd22ef3dd7dd895
tree86ded0fd0c5d2b4c74f90d970dd2fa720d77cb60
parent057679e4df96d34a212ef91dc204a888eaecc863
parente29bd968bd8f6eb6eca1b986d6d714d27c171afd
Merge ... '8c0681c145743970130cbe62da92b45f76b3c4b5'
     and 'b459044149ae9e0fc21221903548ff66c0427cef'