merge of '7a2606dc2c8a5d9ec61bddbad5d013a4bb7bd62a'
authorKoen Kooi <koen@openembedded.org>
Thu, 15 Nov 2007 12:17:02 +0000 (12:17 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 15 Nov 2007 12:17:02 +0000 (12:17 +0000)
     and 'babd660769343b37baf49a84b9c42caf9209315c'


Trivial merge