merge of '400e309c08a8818180ce9e6440f4695a898cdf83'
authorKoen Kooi <koen@openembedded.org>
Wed, 7 Feb 2007 19:51:14 +0000 (19:51 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 7 Feb 2007 19:51:14 +0000 (19:51 +0000)
     and '918e51dad50cec492dd6963b204ad643f9ec7f35'


Trivial merge