merge of 'c1a64808fc49d61ea2634c0c011011da9e5a7886'
authorKoen Kooi <koen@openembedded.org>
Mon, 28 Aug 2006 20:57:29 +0000 (20:57 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 28 Aug 2006 20:57:29 +0000 (20:57 +0000)
commit4f3fdadd87d7e5cea2bd97454857fbc4fd4018e0
treec23064487b502432d9a5cf70bf8fa9e9529cd0c3
parent7e1b30bd2ac0c2d6d27813775cef64db17f04829
parent98d2a57db6b822014361aabad9486fd426d88eaa
Merge ... 'c1a64808fc49d61ea2634c0c011011da9e5a7886'
     and 'c6503f659bf477fbd684cf50b9a73db2e7af3bbc'