merge of '2fe954cb15fbe7a382c756c05c35cb5dfbb34350'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 24 Feb 2008 04:20:09 +0000 (04:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 24 Feb 2008 04:20:09 +0000 (04:20 +0000)
commitb4c9538a4b6d087f625f13b05ac1f0344b21c370
tree85b3218321bc0578d3393c94e364cea837c725d1
parent04ca25a7f9957906c5121005391967de930eb58a
parentde8b532db542948c06b2226a2df53b7bcbfb1f44
Merge ... '2fe954cb15fbe7a382c756c05c35cb5dfbb34350'
     and '45375d79ec784666e2d1135d3d602845ed57d669'