merge of '17c1f582fb1ba7d52e6ad876c69650cdf8ea9dfb'
authorKoen Kooi <koen@openembedded.org>
Tue, 28 Aug 2007 12:19:09 +0000 (12:19 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 28 Aug 2007 12:19:09 +0000 (12:19 +0000)
     and 'd6351c7d214a7c507e680a26e7986755d049ccd2'


Trivial merge