merge of 60b47beac72c6f1f23514b42a309716b470d471b
authorMatthias Hentges <oe@hentges.net>
Thu, 21 Jul 2005 03:28:55 +0000 (03:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Jul 2005 03:28:55 +0000 (03:28 +0000)
     and a6f1ef5bbb3cac8192d0a7bc6d5c64b301e70463


Trivial merge