merge of '171b776054ba3252026d46710fb0cfcfe17c4c9d'
authorKoen Kooi <koen@openembedded.org>
Tue, 31 Jul 2007 10:52:45 +0000 (10:52 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 31 Jul 2007 10:52:45 +0000 (10:52 +0000)
commit3226024921a95fd571dbccdf7752266c20690c1f
treeb954ba8591bd3e8b8435e83e5b2dc16c3bffae2c
parent1d28b8f0f05e4a3b0a97a28e25027eb7e1203687
parent41d1e248d5c941cc99d7436ed74d39cf891927d5
Merge ... '171b776054ba3252026d46710fb0cfcfe17c4c9d'
     and '711eee81007a255a1de4882597073f64879767fe'