merge of '6f38dd43d055a41dad4efd3faa8fb28f66c10ae3'
authorKoen Kooi <koen@openembedded.org>
Wed, 24 Sep 2008 08:33:38 +0000 (08:33 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 24 Sep 2008 08:33:38 +0000 (08:33 +0000)
commitf02abf811dbf693a2e97a071c5e0cdcb0eb15908
tree64a7b7c4bf202b989d8d515e7686d586b6ec19af
parentcd3b199b78c6fcfaf1adfc79b552252b98db5dbf
parent243eaf33f10926c0a9c7c5f3f9f07ee9690b659b
Merge ... '6f38dd43d055a41dad4efd3faa8fb28f66c10ae3'
     and 'cce0978f34bb80458a90186b20dadfd46ccfb0b1'