merge of 'c6c70d85f855fe69c6ca29861984307ff57d8370'
authorKoen Kooi <koen@openembedded.org>
Sat, 7 Apr 2007 18:32:09 +0000 (18:32 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 7 Apr 2007 18:32:09 +0000 (18:32 +0000)
     and 'e02d37909aadff0a737759ca07c087999c357973'


Trivial merge