merge of '49620a480a3c8deee05068287aa90bf723508c27'
authorKoen Kooi <koen@openembedded.org>
Tue, 24 Jul 2007 12:47:13 +0000 (12:47 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 24 Jul 2007 12:47:13 +0000 (12:47 +0000)
     and 'b8722b34f06f673d698f22dd82b3b225392cfdfb'


Trivial merge