merge of 0b2d2dab01a71f8522d03a6b9052a532752f6252
authorHolger Freyther <zecke@selfish.org>
Sun, 14 Aug 2005 14:49:49 +0000 (14:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 14 Aug 2005 14:49:49 +0000 (14:49 +0000)
     and 6b49a965af76925e57f0c413d3dcdd60c0170fa4


Trivial merge