merge of '16117855ab79f990564455eee9d420e472e6ab44'
authorKoen Kooi <koen@openembedded.org>
Wed, 25 Jul 2007 15:20:22 +0000 (15:20 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 25 Jul 2007 15:20:22 +0000 (15:20 +0000)
     and 'a4e4bdd6c9f1532c72e89559a85e2a3c12d161b5'


Trivial merge