merge of '45fb4fa94d52a65c3a3fa636c6122139173dfa8d'
authorKoen Kooi <koen@openembedded.org>
Tue, 12 Dec 2006 20:27:47 +0000 (20:27 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 12 Dec 2006 20:27:47 +0000 (20:27 +0000)
     and 'aa6010d679e0e80d63f4e63191b66e5759482858'


Trivial merge