merge of '8961e177cdb0b701e3bb0304ec24d5c4a3947254'
authorKoen Kooi <koen@openembedded.org>
Tue, 31 Jul 2007 16:13:30 +0000 (16:13 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 31 Jul 2007 16:13:30 +0000 (16:13 +0000)
     and 'e3756fffb6fe48cc7854ecab0ddfe07c21359f15'


Trivial merge