merge of cd42ec314bd37793cf241d63236ff65f5851c99e
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 27 Jul 2005 09:56:00 +0000 (09:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 27 Jul 2005 09:56:00 +0000 (09:56 +0000)
     and ec21bc325dc1d1e889b34a10304e189b8f8bc6fc


Trivial merge