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


Trivial merge