merge of 78a60f71ad7ac118c197c1f2a880699f4d44c06b
authorccsmart <ccsmart@smartpal.de>
Thu, 7 Jul 2005 19:15:44 +0000 (19:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 7 Jul 2005 19:15:44 +0000 (19:15 +0000)
     and caf13453181642ef1e5bd8e5e5a4e8a0e2967224


Trivial merge