merge of 865901d3478c57c034f017d899de72e3a1d305be
authorccsmart <ccsmart@smartpal.de>
Sun, 4 Sep 2005 20:05:07 +0000 (20:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 Sep 2005 20:05:07 +0000 (20:05 +0000)
     and c1e0c38387641b68ca5db5f57cbcfc3e302869ec


Trivial merge