merge of '381f062d9435d56c4a2fe6ab295046be014e94a1'
authorKoen Kooi <koen@openembedded.org>
Sun, 17 Jun 2007 10:02:32 +0000 (10:02 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 17 Jun 2007 10:02:32 +0000 (10:02 +0000)
commitce8819cf9c39e47d0ae5718e6ed960f773f75c31
treed7bd05204524f5556e9f37e4e6bc609629150d11
parentdb7671f322f01a42f3da13b0f1cf755e61605b15
parent2da777781dd039543cc7d0e94d2bbe3f97a20a4b
Merge ... '381f062d9435d56c4a2fe6ab295046be014e94a1'
     and '636893a3af4e8e5404ce4917f3701dbe8fc0ab46'