merge of '5b517db465e78171fe40e917eed17ab8594b1423'
authorKoen Kooi <koen@openembedded.org>
Wed, 13 Sep 2006 21:06:36 +0000 (21:06 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 13 Sep 2006 21:06:36 +0000 (21:06 +0000)
     and 'ffa337dbaac9ce437c92c6e2b6e0d8f6f8186bfc'


Trivial merge