merge of '344877dac1be60d7f6d718179f6d015c047ad23e'
authorKoen Kooi <koen@openembedded.org>
Fri, 16 May 2008 18:43:25 +0000 (18:43 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 16 May 2008 18:43:25 +0000 (18:43 +0000)
commitbcddbb9aaf2369a82a79b847b3be18ac820ce6e7
tree3ff17f47f868f374595a65be327cc8aa053640ec
parent6fda94496ad2c1e435e8edf95c86cf7e60d11261
parent5e1c73b9c9b89edf166047bef2ac67aa43e561ae
Merge ... '344877dac1be60d7f6d718179f6d015c047ad23e'
     and 'e293c46f8f09b6eaa2999aeb6d575e1b84e6c7b4'