merge of 40dd65ee679ec60cc190d4c6be30ff366e22f0db
authorGraeme Gregory <dp@xora.org.uk>
Mon, 16 Jan 2006 14:17:33 +0000 (14:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 16 Jan 2006 14:17:33 +0000 (14:17 +0000)
commit05d03e47e5a5d3ed7a2cfc6860966a415ae7ddf6
treec0f211fb91db0835a6280704618f2ff5d95d8dcc
parent31e1eded1f86954aa1f7b40bddc66a49698519cf
parent4a23611f8a6c27539253019a8ab581e7fc6ccfd4
merge of 40dd65ee679ec60cc190d4c6be30ff366e22f0db
     and 8430d0607315085d8609a176b022ef4857edf05f