merge of '190c583e92702619da237578aa0be6d527f7da36'
authorKoen Kooi <koen@openembedded.org>
Mon, 2 Jun 2008 21:47:44 +0000 (21:47 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 2 Jun 2008 21:47:44 +0000 (21:47 +0000)
     and '9c471eb161aadbb6db3383632fbea28318826a54'


Trivial merge