merge of '2001ac2acd66ae1b7566b3830724007b6854f03f'
authorKoen Kooi <koen@openembedded.org>
Tue, 14 Nov 2006 10:07:42 +0000 (10:07 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 14 Nov 2006 10:07:42 +0000 (10:07 +0000)
     and 'a6961e05d6a31b23961267e50853355f41ab5891'


Trivial merge