merge of de96ee4ffd6b983d21a661eea91670155cdf3192
authorMatthias Hentges <oe@hentges.net>
Wed, 12 Apr 2006 14:52:23 +0000 (14:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 12 Apr 2006 14:52:23 +0000 (14:52 +0000)
     and ed5c3f3e7e11b0bf1767740e26ef8b4a21089be5


Trivial merge