merge of 2af94f47b2ba34daf8f717acaf9c292ce1f42c61
authorMatthias Hentges <oe@hentges.net>
Mon, 8 Aug 2005 14:51:47 +0000 (14:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 8 Aug 2005 14:51:47 +0000 (14:51 +0000)
commit0a873fcb06c64d24f12ed36de6e77d0d94ff3201
treef9151374b5d56a9e5647d19344342177fcf22250
parent9fb2641bccd42f1000029d6829c8233de5233fe4
parentea0a9c3e0ced61b9e4c330ad2362f262f0e08037
merge of 2af94f47b2ba34daf8f717acaf9c292ce1f42c61
     and 626a7a777e8de41589b88c0e6087c6a26d3739de