merge of 'dad836385287178e12f53cd63adfb7b695a4c09f'
authorKoen Kooi <koen@openembedded.org>
Mon, 1 Jan 2007 21:16:36 +0000 (21:16 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 1 Jan 2007 21:16:36 +0000 (21:16 +0000)
commitc7a75369a604886422683f53404b8a5a9d0722a2
tree6ba25cb0c5c211a58d876495c9ec2a78ee47daf6
parentc313fdca26466648928e5eecd4797170fbf028c7
parentb57cda852866051daff509b0100a37c367f9d255
Merge ... 'dad836385287178e12f53cd63adfb7b695a4c09f'
     and 'e9e449e083c624d15e55fc8135249c653031f4f1'