merge of '1401e62254aef0a87a8ce5b685e66d1eb00359e3'
authorKoen Kooi <koen@openembedded.org>
Mon, 1 Oct 2007 12:58:13 +0000 (12:58 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 1 Oct 2007 12:58:13 +0000 (12:58 +0000)
     and '782254b73af8b1a6dcd10f60816bb473eaf366a0'


Trivial merge