merge of '73cd766816e9208e9486f1d0730123cf56b98a13'
authorKoen Kooi <koen@openembedded.org>
Fri, 7 Sep 2007 08:19:55 +0000 (08:19 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 7 Sep 2007 08:19:55 +0000 (08:19 +0000)
     and 'ab566828f65e3118a463af4edd4374ec860dc16b'


Trivial merge