merge of b69c981e27fd4ef4c385796d80f1095b8859ce1c
authorGraeme Gregory <dp@xora.org.uk>
Fri, 5 May 2006 14:25:05 +0000 (14:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 May 2006 14:25:05 +0000 (14:25 +0000)
commitf93ffca8ac0f3a0b26894e2a18df0e1d0532e275
treebf236932dc6c2083af5d6db6fed2f0d8e59a9d00
parent0c834c2aee9c6885b70dc83bf3636bd40c18a0ca
parent42b9347b3838185bc30dd8cba40035b346c844f7
merge of b69c981e27fd4ef4c385796d80f1095b8859ce1c
     and c75247f1df9bd969d70c5d008f7faf430c842080