merge of 6e9e8adcb21fef25823c9f2d82e7207a517c308a
authorKoen Kooi <koen@openembedded.org>
Fri, 3 Mar 2006 17:00:58 +0000 (17:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 3 Mar 2006 17:00:58 +0000 (17:00 +0000)
commitdc93078f8d7e84148dbea397bcbeaeb2b26000a4
treea22f70687d39260ed96c41cb73daefb956fa740d
parent33bcbf5161fd0d6475e0ce44af3344b541d97d51
parentd6a003a9b255b4bb4669c5de5b2db1b43a12aa13
merge of 6e9e8adcb21fef25823c9f2d82e7207a517c308a
     and 93aa2173d41c73ee5f9af3bc402117d7287055c2