merge of 6340b7b27daca8ee4d5ae8542bdcd7207897c823
authorHolger Freyther <zecke@selfish.org>
Wed, 26 Apr 2006 15:48:05 +0000 (15:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 26 Apr 2006 15:48:05 +0000 (15:48 +0000)
     and 9bebf05da4ff7015fee602e90feca5de0e119c18


Trivial merge