merge of '166a496479db8302a15b8d67da979a4d5831f049'
authorKoen Kooi <koen@openembedded.org>
Wed, 30 May 2007 09:52:21 +0000 (09:52 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 30 May 2007 09:52:21 +0000 (09:52 +0000)
     and '6eac237f0d909ba98b365d88b337ff3e822907e1'


Trivial merge