merge of 2283efd4d5567696fe045058b3d139e9871549e9
authorKoen Kooi <koen@openembedded.org>
Tue, 4 Oct 2005 12:20:58 +0000 (12:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Oct 2005 12:20:58 +0000 (12:20 +0000)
     and a05aaf78acc129c5a440be0cbcd97444c43e57e6


Trivial merge