merge of '4e4a2d2a3c172e0018ad8039dd9f8ac05a09e270'
authorKoen Kooi <koen@openembedded.org>
Sun, 12 Nov 2006 13:27:50 +0000 (13:27 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 12 Nov 2006 13:27:50 +0000 (13:27 +0000)
     and 'd3403321e11792348c80c7e027874c49dd3ae4b1'


Trivial merge