merge of 'b0b77e51fdd4802821fa1c92b384ac48838955b2'
authorKoen Kooi <koen@openembedded.org>
Fri, 1 Sep 2006 21:45:31 +0000 (21:45 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 1 Sep 2006 21:45:31 +0000 (21:45 +0000)
     and 'f090702de43860d9ba4cb4911dc980b293defc81'


Trivial merge