merge of '566766a2d7562a96a2abccaf2cea055e8c0cbfc6'
authorKoen Kooi <koen@openembedded.org>
Wed, 29 Nov 2006 11:13:02 +0000 (11:13 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 29 Nov 2006 11:13:02 +0000 (11:13 +0000)
commit12bb4c41c375d36b596ba4eb0a9c8ce1d6ace10e
tree81abe55cbed2ba71d45d453c62584f68e043e4f3
parent987d97fdb842aa200a5f77eb52430a21fccb18bb
parent70527abde72e1c7e3949da2b8d8c1acd32f80f74
Merge ... '566766a2d7562a96a2abccaf2cea055e8c0cbfc6'
     and 'efd4f14c4b3b225594b87a854b5848082b05669d'