merge of 7520de304a270fbab16bd5fe46ec31e3fe275d51
authorKoen Kooi <koen@openembedded.org>
Sun, 4 Sep 2005 21:44:13 +0000 (21:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 Sep 2005 21:44:13 +0000 (21:44 +0000)
     and 83d783506adf2e4fdcf6dc9a8381006b0756ed73


Trivial merge