merge of '0a670ad135de80006479fae559372bd4a2a6953e'
authorKoen Kooi <koen@openembedded.org>
Thu, 21 Dec 2006 21:44:02 +0000 (21:44 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 21 Dec 2006 21:44:02 +0000 (21:44 +0000)
commit12c72683f4c3cfd9cf1669ff81ca95ecdd84dc02
treec1bd3b7ad434226e8e94ec81ab3600bbe5442d8f
parent9aa7e3d378be0357b0e42acad83664cadf3c70f5
parent54de21ef73e5d526b647c21fed94cd2283a68be7
Merge ... '0a670ad135de80006479fae559372bd4a2a6953e'
     and '850dbef2977c53c7f819381ceb94ff469adaddc8'