merge of 10517186af48d14182d0add85267651917d6625c
authorccsmart <ccsmart@smartpal.de>
Mon, 1 Aug 2005 20:49:00 +0000 (20:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 1 Aug 2005 20:49:00 +0000 (20:49 +0000)
     and 5f72a960b6a39aff5692423f45ca63cdb17da63c


Trivial merge