merge of 015819701896dc2df9f749ce23a18396353e34c5
authorHolger Freyther <zecke@selfish.org>
Mon, 19 Sep 2005 13:09:59 +0000 (13:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 19 Sep 2005 13:09:59 +0000 (13:09 +0000)
     and daa9aa7053ce66d42b09765d68c0c829dc72ad79


Trivial merge