merge of 5f35d986fdda87fb19898bc6150d8325c737273f
authorMatthias Hentges <oe@hentges.net>
Mon, 3 Jul 2006 15:16:55 +0000 (15:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Jul 2006 15:16:55 +0000 (15:16 +0000)
commit7b674fde0f4b05e2e3d5c6062e8ebd7e462f6800
treec6a5f095fd17a986a3a8d0adecebc40add14aef5
parent71c98c82d9fe431909223d48d87b89f94012dfe8
parent5badc4267510b46619fbbe88d0a4acc56f8c4fc5
merge of 5f35d986fdda87fb19898bc6150d8325c737273f
     and e97331a2b823abbbc0aa40e32d3ce1f542575042