merge of '230251372ae3b661dbbc35952d8e8514a1af2862'
authorKoen Kooi <koen@openembedded.org>
Sun, 13 May 2007 17:11:30 +0000 (17:11 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 13 May 2007 17:11:30 +0000 (17:11 +0000)
commiteaa8fa765519fafab0f77a2ba8daec6a21d75adf
treef2812493ec54fdb6007611c62d3d7f97fd9948a5
parentfc46eaa94c935969e09fab78bfd32460cc5ea8f4
parent9773687e679f9af345fd4b782ff6acc2594fe24a
Merge ... '230251372ae3b661dbbc35952d8e8514a1af2862'
     and 'd9bdc4e291d6140a14021f209f3e3c2c07f7ebd9'