merge of 4a52b2abf7680da958a90ec6fd03a53027731946
authorKoen Kooi <koen@openembedded.org>
Mon, 1 Aug 2005 09:56:43 +0000 (09:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 1 Aug 2005 09:56:43 +0000 (09:56 +0000)
commit2fd998e51b17d878a1b610f802c52926cde12e3d
treef23a4af6de4fbe7b317eac77504a85956ccd644a
parenteee5de0727bc6c65167ab44898700ee3d1314c6f
parenta14d3881700b6e5cd6b6b414bf81094b2e0d903c
merge of 4a52b2abf7680da958a90ec6fd03a53027731946
     and 7ef6035dfceaecf4b902f0aa0277a7de73566580