merge of 'aa36aa92826b8f74328b39933671dd201b795054'
authorKoen Kooi <koen@openembedded.org>
Fri, 19 Oct 2007 19:45:58 +0000 (19:45 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 19 Oct 2007 19:45:58 +0000 (19:45 +0000)
commitc99842e673f8bc75dfa3d8600fba9970251549ff
tree659554a039731f25137fd7f8eea4074069914514
parent174f21f49d25ea1445039886787eb7c5ff4150c8
parent16d317460be211eb0e32d9fc98b3535ee52d4a39
Merge ... 'aa36aa92826b8f74328b39933671dd201b795054'
     and 'bc72cbe491bc556448f73971b4b962b9a60c9dd9'