merge of '60961ec466bc4987a9fab147de3b7703dfe6317f'
authorKoen Kooi <koen@openembedded.org>
Wed, 15 Nov 2006 22:47:14 +0000 (22:47 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 15 Nov 2006 22:47:14 +0000 (22:47 +0000)
     and '8de3a261a06263fdf455610b427ac1a092b1acf8'


Trivial merge