merge of 184b27ced469fdd85ff3130c07f410177622b810
authorHolger Freyther <zecke@selfish.org>
Sun, 9 Apr 2006 17:46:00 +0000 (17:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 9 Apr 2006 17:46:00 +0000 (17:46 +0000)
     and eebfc319a1937dabc17f3fbbb4c1d86e0de7fc2f


Trivial merge