merge of '5c1ed62467a4b699ec7940179d22e83acf36ad4f'
authorKoen Kooi <koen@openembedded.org>
Mon, 1 Jan 2007 18:19:17 +0000 (18:19 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 1 Jan 2007 18:19:17 +0000 (18:19 +0000)
commite757490d49e9cb18ff4114eb44db8207dde827e9
treeb632af958800491add8fee9dd34ab2c2d0510464
parent4a6ac907a9d6a444004a4384b53581b9ca09e090
parentd03b28a9b699f505895eb0048eb1defa3e0b72a6
Merge ... '5c1ed62467a4b699ec7940179d22e83acf36ad4f'
     and '7ac3268bfbc5039a8aba9b5db44344ebfaa1f59c'