merge of '57565ef68b5336bb18f16b962b9646b84daff984'
authorKoen Kooi <koen@openembedded.org>
Sat, 20 Jan 2007 15:53:26 +0000 (15:53 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 20 Jan 2007 15:53:26 +0000 (15:53 +0000)
commit71fc427b1413e9655faf11367baf8bf91ced5a7e
treeda7b6d8467130a802e486ac627c916ff97ba79ac
parentdd766b65197c71b5583aaa3b3274c3099793c293
parent41f0fbcb6706d59e96dbb58d586aa3bd9fdfc7e1
Merge ... '57565ef68b5336bb18f16b962b9646b84daff984'
     and '69802b5fc5dcf27f5b27f6a9a9aadb1f3a808b71'