merge of 4aff7df6d6db91a152ee90e3cb907cd6f13bbba8
authorGraeme Gregory <dp@xora.org.uk>
Mon, 16 Jan 2006 14:12:55 +0000 (14:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 16 Jan 2006 14:12:55 +0000 (14:12 +0000)
commit4a23611f8a6c27539253019a8ab581e7fc6ccfd4
tree9a40c7a8204a44e09da95eb59cffba38a40fd5c8
parentd03ad53afdff867b46dbd00b9483cbca239c1049
parentd33b1325a53496a321b3cdb8398ad1fa41a69422
merge of 4aff7df6d6db91a152ee90e3cb907cd6f13bbba8
     and 55baaf0245d63854fcce5ac1b626215d06c99ce1