merge of '3ec7cab836f802bb1b737eb375a0d1422ea5099b'
authorKoen Kooi <koen@openembedded.org>
Tue, 31 Jul 2007 08:47:59 +0000 (08:47 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 31 Jul 2007 08:47:59 +0000 (08:47 +0000)
     and 'f0acec47ef997751817df5f6b967a73fec86904a'


Trivial merge