merge of '6989002d4c2b4ec91fce1dff1c9495f8f5227065'
authorKoen Kooi <koen@openembedded.org>
Sun, 4 Feb 2007 09:16:23 +0000 (09:16 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 4 Feb 2007 09:16:23 +0000 (09:16 +0000)
commitb14f95b7e50ed14232998929a5fa835d9e7a681b
treee4a7e4001ec58dc960524a9ad16d2151df11df79
parent8cc0930b788d6e708ea70bd73e13290dc701af0d
parent3e614bb68101a9bb7d8802440f0785e95e6398c3
Merge ... '6989002d4c2b4ec91fce1dff1c9495f8f5227065'
     and '6ffad588794efffeaf5bd4b81f8aa3c7d3155dfa'