merge of '705196b2d72ab98805eba68c1d18a11b85c6d56f'
authorKoen Kooi <koen@openembedded.org>
Mon, 29 Oct 2007 10:33:46 +0000 (10:33 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 29 Oct 2007 10:33:46 +0000 (10:33 +0000)
     and 'f8274b21ad6717d64b836fe0752d337715f16e82'


Trivial merge