merge of 789079a5a7935b64dc97e49d75b891825d9f40a1
authorccsmart <ccsmart@smartpal.de>
Sun, 18 Sep 2005 12:59:51 +0000 (12:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 18 Sep 2005 12:59:51 +0000 (12:59 +0000)
     and d57da27a825328d9792b7a84bcca9bc0b97fc957


Trivial merge