merge of 206b62d33d8fadd9502205340feea3a4daeadab2
authorHolger Freyther <zecke@selfish.org>
Sun, 30 Apr 2006 10:01:45 +0000 (10:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 30 Apr 2006 10:01:45 +0000 (10:01 +0000)
     and c1af7d38a30e0ddecb5419ddff4da1059d587a73


Trivial merge