merge of 7a7b09b428b0fc588bb40bec9d545736c70956e8
authorKoen Kooi <koen@openembedded.org>
Wed, 3 Aug 2005 09:41:04 +0000 (09:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 Aug 2005 09:41:04 +0000 (09:41 +0000)
commit11a2c0bf83920ce4c312883ca17ad27ef3705eee
tree47d22809cb86841347dcfd98398a68f19e424a2c
parent46a255a27b2f4561c64e2f9da5701d45a4170a40
parent37f6c0f509d71161d27fbe78573ef21d335272ef
merge of 7a7b09b428b0fc588bb40bec9d545736c70956e8
     and 7ab1b01cd9231fe128eea9ab71f6ec45d2dbd6bf