merge of 982bd6dee5de1d8614e7b6dca3d8ff2864d9be56
authorKoen Kooi <koen@openembedded.org>
Sat, 27 Aug 2005 18:13:49 +0000 (18:13 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 27 Aug 2005 18:13:49 +0000 (18:13 +0000)
commit69016e2acd392b601b9f34b9805711fa007ae937
treecafec8d198bcef7063a9d85082ac6f31f508e235
parent3d65e3ebf8fcdce26763674a0c4b09149bec33be
parentd6e949ee7a1785af2068f63dfdb8d1f81fa7107e
merge of 982bd6dee5de1d8614e7b6dca3d8ff2864d9be56
     and afe5b334025f7a057bb991cd4da6a637f11a8310