merge of '171104fab4f21e3a390cb753995beffa459843ab'
authorKoen Kooi <koen@openembedded.org>
Wed, 26 Jul 2006 14:22:08 +0000 (14:22 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 26 Jul 2006 14:22:08 +0000 (14:22 +0000)
     and 'f1ae9d5e5629b09643d5895312ada9a356e6b700'


Trivial merge