merge of 213055f44fbb065f13acbde0cf78285357fa5b17
authorKoen Kooi <koen@openembedded.org>
Sun, 21 May 2006 20:20:56 +0000 (20:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 May 2006 20:20:56 +0000 (20:20 +0000)
commit94a4513ecc9f30de777ae048ab2838fb15338e5d
treec01b1504f1804c5012bc4234d2148aa34e82367d
parent7b58691d3939afaeb888705a142023befcced6e8
parentee1a8f5aa9b1cb55e5430d3894ca60106aea57c7
merge of 213055f44fbb065f13acbde0cf78285357fa5b17
     and 48bf49548c49f23c0829416516d9a654545ea89e