merge of bff5eb1baa4a8d1aeba9320cdea1a563336225a0
authorHolger Freyther <zecke@selfish.org>
Sat, 10 Sep 2005 15:21:32 +0000 (15:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 10 Sep 2005 15:21:32 +0000 (15:21 +0000)
     and e38d675ca5489ba7485a5c41f1c1634ca872c509


Trivial merge