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)
     and 'bc72cbe491bc556448f73971b4b962b9a60c9dd9'


Trivial merge