merge of 674017eb4dff8527f93f526834e8c7e766e1f8a3
authorHolger Freyther <zecke@selfish.org>
Sat, 30 Jul 2005 23:18:50 +0000 (23:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 30 Jul 2005 23:18:50 +0000 (23:18 +0000)
     and fd8ded63c0d4d973c538826b220b820a05485c89


Trivial merge