merge of '65ff7721de076446ac1291f0f00a8fb30df71eff'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 5 Sep 2006 08:22:33 +0000 (08:22 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 5 Sep 2006 08:22:33 +0000 (08:22 +0000)
     and 'b13a3adc90df932a6883441aed9566c63536b2a6'


Trivial merge