merge of 'a2a414dc8c26784dc8f35ecddb62ca87e5d0f634'
authorKoen Kooi <koen@openembedded.org>
Fri, 22 Jun 2007 07:49:23 +0000 (07:49 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 22 Jun 2007 07:49:23 +0000 (07:49 +0000)
commita9a32cf9034963872a0ae44036f0ecfb2a7069c0
tree34871b81e02fcf79ab0618fa30a1c870cfbaa0c5
parent19d91f3c676370ab78e31ba67d3d9db715ddfc63
parent005b94b2d0208080b63ccd708fd354cf5717b84c
Merge ... 'a2a414dc8c26784dc8f35ecddb62ca87e5d0f634'
     and 'e41ad38990f6485eb33ce1902f7cd10880deba5b'