merge of 0aff07c0ec1ad6cd2825cb3f73fa8ea5948359e8
authorccsmart <ccsmart@smartpal.de>
Sun, 10 Jul 2005 08:39:33 +0000 (08:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 10 Jul 2005 08:39:33 +0000 (08:39 +0000)
     and b6beeff01c7a8b7ba6cf72a1a343d02c084f71b9


Trivial merge