merge of 58fa3405ec1464ee3bd0716311bfa77dabbb7efb
authorHolger Freyther <zecke@selfish.org>
Wed, 3 May 2006 23:37:46 +0000 (23:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 May 2006 23:37:46 +0000 (23:37 +0000)
     and 6d737ec19d3bd5b26038aaedb38bafd499aece0b


Trivial merge