merge of 39ec5c108a34c5b8050cb5c43e6e9b01d0a7e695
authorccsmart <ccsmart@smartpal.de>
Wed, 6 Jul 2005 18:15:03 +0000 (18:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 6 Jul 2005 18:15:03 +0000 (18:15 +0000)
     and bff71dff596d0325ccafbf13fc11a5beb1b38b89


Trivial merge