merge of '9e8fa08e687f308e46230b3b21322dd836444437'
authorKoen Kooi <koen@openembedded.org>
Mon, 29 Sep 2008 18:16:10 +0000 (18:16 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 29 Sep 2008 18:16:10 +0000 (18:16 +0000)
     and 'f7dc745c5616c2ded1ef5a622a2de0fa80bb03ad'


Trivial merge