merge of 8f7f4f1a6f08da91c5fe2312650063893394888b
authorKoen Kooi <koen@openembedded.org>
Tue, 4 Jul 2006 17:42:49 +0000 (17:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Jul 2006 17:42:49 +0000 (17:42 +0000)
commit3fbcf379bbd88204d7dd396415bbb65346feeaab
tree9a74ccf298a095cc74eb6bcc2cb878f98c5b548d
parent7fd16b8fe80ee1707595b3a6026e9026a0717502
parent86d9211f52171f3367ce974b997e16864e20118d
merge of 8f7f4f1a6f08da91c5fe2312650063893394888b
     and f69ed55f40216d16d8f1cb7559d13b46385991b2