merge of 40758b8f78807bab8274eaa33560a44c6ac8ec96
authorKoen Kooi <koen@openembedded.org>
Sun, 23 Apr 2006 15:19:52 +0000 (15:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 23 Apr 2006 15:19:52 +0000 (15:19 +0000)
commit5161b5fe592dadae4dda20e858baffb5e75b5725
treeb3e79df8dd426955e870effc54a02b4f17204f14
parent2c30d428f51c8bb65ecc2906b4fade1cb602d318
parent9bdb9dba1ae820afc40494807a4a1d19ca707b03
merge of 40758b8f78807bab8274eaa33560a44c6ac8ec96
     and d3c662025b052c84cfcdc2153cd3cf75465bae87