diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-06-22 07:49:23 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-06-22 07:49:23 +0000 |
| commit | a9a32cf9034963872a0ae44036f0ecfb2a7069c0 (patch) | |
| tree | 34871b81e02fcf79ab0618fa30a1c870cfbaa0c5 | |
| parent | 19d91f3c676370ab78e31ba67d3d9db715ddfc63 (diff) | |
| parent | 005b94b2d0208080b63ccd708fd354cf5717b84c (diff) | |
merge of 'a2a414dc8c26784dc8f35ecddb62ca87e5d0f634'
and 'e41ad38990f6485eb33ce1902f7cd10880deba5b'