merge of d23fa20efa477539bb55a99c02a96896167f1c2b
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 21 Jul 2005 21:38:58 +0000 (21:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Jul 2005 21:38:58 +0000 (21:38 +0000)
commit3c0cb2cdfeeadc79a81ff78b3f74785c1dc11932
tree6aa3116846275777b7784f7d0e2f15317b80698e
parentc4703f1da90d9eb7d947c98f7b2541d8b61cc097
parent7d1dc55f6d1d02a283c152e26da59e9a99a0ec1e
merge of d23fa20efa477539bb55a99c02a96896167f1c2b
     and d974b2fdc2202ed227cf57f941cdb0b45b03cf15