merge of 0a462c258ca6d11f40f09df2cf22d4ed4f73959a
authorccsmart <ccsmart@smartpal.de>
Sun, 4 Sep 2005 20:07:09 +0000 (20:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 Sep 2005 20:07:09 +0000 (20:07 +0000)
     and bd69c06fd1ed9e15c5744b138b32a5b091bf806e


Trivial merge