merge of '269c1d3f7a6a873041635f5ec41aacff978e166d'
authorKoen Kooi <koen@openembedded.org>
Sat, 2 Sep 2006 17:31:51 +0000 (17:31 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 2 Sep 2006 17:31:51 +0000 (17:31 +0000)
commit13f062b8488b5e53ae1c74f140ed421550ee8923
treeca718637d8ffdb6b0db72c99d4d00ef760b52904
parent59ddae46040775c9ad7514adc1d72a9cb6bb83ea
parentd3e9d5b3b92c0f04dc1c73ea94758ed974e3d8b9
Merge ... '269c1d3f7a6a873041635f5ec41aacff978e166d'
     and '6401c65a46b33356819b171a03e513d4de5c0225'