merge of 5c4d556f091e882c9014ef703c500aed62f7c8f0
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 6 Jul 2005 09:39:49 +0000 (09:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 6 Jul 2005 09:39:49 +0000 (09:39 +0000)
     and 837e5daaf31596d1e2871f95c79958909726dc02


Trivial merge