merge of 741270052fa677010603209da3adb0f5194af3ef
authorccsmart <ccsmart@smartpal.de>
Sat, 9 Jul 2005 16:29:38 +0000 (16:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 9 Jul 2005 16:29:38 +0000 (16:29 +0000)
     and 8b65cbd401e1f926a05aed4038504520748a6824


Trivial merge