merge of 7441878ba0c588c0781b7565310897973e6f36af
authorccsmart <ccsmart@smartpal.de>
Sat, 27 Aug 2005 16:49:51 +0000 (16:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 27 Aug 2005 16:49:51 +0000 (16:49 +0000)
     and 76212ac44485e51989d04e8572e5b46bc808d90f


Trivial merge