merge of 70c6a809b479d2c6e6e5eaaffd412be3c60d71f3
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 18 Jan 2006 10:54:38 +0000 (10:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 18 Jan 2006 10:54:38 +0000 (10:54 +0000)
commitec51545a229f2400954e6ef1680d9874f8bc32b6
treeb53cc2dd34edfad867cdfd122c7612bd847a8200
parentd5d23d6428b7ea36bc88ab0216f46fa5fc8675d4
parent43cd3c0c6b338107c3540233600f2a0bf16854e1
merge of 70c6a809b479d2c6e6e5eaaffd412be3c60d71f3
     and 9c6d2f9ed3be4745760b4dcd14811587f4acd623