merge of 18847e62fc2cebf8bf5fbc961455a822595bd286
authorccsmart <ccsmart@smartpal.de>
Tue, 12 Jul 2005 17:32:04 +0000 (17:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 12 Jul 2005 17:32:04 +0000 (17:32 +0000)
     and 1914638053e25325f77b538372387dc16ca1f962


Trivial merge