merge of 'aebf88ce897b2503c671d3dd0b5828248df55257'
authorKoen Kooi <koen@openembedded.org>
Mon, 28 Aug 2006 21:00:38 +0000 (21:00 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 28 Aug 2006 21:00:38 +0000 (21:00 +0000)
     and 'e61f227fe61100734aa43b3a5076a84a40cf3c3d'


Trivial merge