merge of '6390f37ba1af225733a09408253deb2c380f9603'
authorKoen Kooi <koen@openembedded.org>
Sat, 6 Jan 2007 13:59:27 +0000 (13:59 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 6 Jan 2007 13:59:27 +0000 (13:59 +0000)
commit1c8bccf6feba33b30e92331a81df18be1d53564a
tree3614fd11e659e570b3e221ec0235e804437f971e
parentea6b49619860c64c1090a6f26ea8b4210e404b69
parent9a64f9cc8b9d6ddbb06c5ecaf9ba29f0ba32f887
Merge ... '6390f37ba1af225733a09408253deb2c380f9603'
     and '8ce2ae26934b58d193c011f402be69699132abb0'