merge of '17456d839ed6d5a9ca1e700a26784cc663820a4d'
authorKoen Kooi <koen@openembedded.org>
Thu, 15 Feb 2007 20:20:32 +0000 (20:20 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 15 Feb 2007 20:20:32 +0000 (20:20 +0000)
     and 'ffd5b1436a28fe33ef6213ae4b0371af61aad94f'


Trivial merge