merge of 18e058971e016e73900c603bff12aec32123910b
authorHolger Freyther <zecke@selfish.org>
Sun, 12 Feb 2006 19:05:23 +0000 (19:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 12 Feb 2006 19:05:23 +0000 (19:05 +0000)
     and e1bf3143b97e45cbce12c763db9522aba9e6e488


Trivial merge