merge of '2ca01af51f12b07b28c6a80e57347d82f7122780'
authorKoen Kooi <koen@openembedded.org>
Sat, 5 Aug 2006 19:50:54 +0000 (19:50 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 5 Aug 2006 19:50:54 +0000 (19:50 +0000)
commit7a3ad4715faf8adc906eb394d1c242033c3944fa
treedab2f1a14da2fda0d520037deafa96a1de6c23ed
parentfafbb42f3369782a8298f59ec45d919cfa48987d
parentc5590211fb861491261866b9f64bbfb32c474394
Merge ... '2ca01af51f12b07b28c6a80e57347d82f7122780'
     and '7f3bc3b8600afa9c810238b8d5a88ec7a80c6c9a'