merge of 80f30ae21237b71a9c041da46d5aab2ee7aeec6f
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 26 Jul 2005 07:37:16 +0000 (07:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 26 Jul 2005 07:37:16 +0000 (07:37 +0000)
     and ed9472a378dee1861e1a52f581cdbbea9d959a63


Trivial merge