merge of fa2942578b779e2f09210ed8416c89ed68c49837
authorMatthias Hentges <oe@hentges.net>
Mon, 27 Mar 2006 16:38:24 +0000 (16:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 27 Mar 2006 16:38:24 +0000 (16:38 +0000)
     and 8809b1f1d7adf1812d6bf8155574eb4721370006


Trivial merge