merge of '8aa0a2deaca11c572f50a69143d5615291b53252'
authorKoen Kooi <koen@openembedded.org>
Fri, 13 Oct 2006 10:40:41 +0000 (10:40 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 13 Oct 2006 10:40:41 +0000 (10:40 +0000)
     and 'fbafee3316502a2cb328539afae729d307064ecd'


Trivial merge