merge of 135034cf51fecc3c52b45d1a26261b3b2d93bac6
authorRod Whitby <rod@whitby.id.au>
Mon, 20 Mar 2006 11:25:10 +0000 (11:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 20 Mar 2006 11:25:10 +0000 (11:25 +0000)
commit08c9337a82e50e26565453b3242396a127ef98c2
treecc893593d6e427c3ee8416aae553c0ce0b6cceaa
parente404d3f4b1ea1b7a4578d34398a3fcfde8a01870
parent0355f6e033131c804cd4583e0715d54d30e797fb
merge of 135034cf51fecc3c52b45d1a26261b3b2d93bac6
     and 599ce309bcded85efa1ed80fedea59fce4bb01ed