merge of 08f8592df7cccc3c4e3e8320dc207aea052520d4
authorMatthias Hentges <oe@hentges.net>
Wed, 12 Apr 2006 15:33:27 +0000 (15:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 12 Apr 2006 15:33:27 +0000 (15:33 +0000)
     and de96ee4ffd6b983d21a661eea91670155cdf3192


Trivial merge