merge of '3b618e174a1bdef0e2e2e2fe1efddadb3d3ce48d'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 7 Sep 2007 20:15:38 +0000 (20:15 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 7 Sep 2007 20:15:38 +0000 (20:15 +0000)
     and 'a12d2158881e274d028f6fb907b2bd832647e870'


Trivial merge