merge of 6da21d0d95b412989c3883c587af4931afea6741
authorKoen Kooi <koen@openembedded.org>
Thu, 21 Jul 2005 21:38:28 +0000 (21:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Jul 2005 21:38:28 +0000 (21:38 +0000)
commit2167bc60b5196f9172fc95bbf99f89bc57b73189
tree323270453f8d6bb3c0cb1cf561664f1a7d534dca
parentc4703f1da90d9eb7d947c98f7b2541d8b61cc097
parent5521f7bd12a6ea3553cc8f06fd5e0026e22eb4b2
merge of 6da21d0d95b412989c3883c587af4931afea6741
     and d23fa20efa477539bb55a99c02a96896167f1c2b