merge of '54848140214b3d180243cd747004c124b89af382'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 2 Dec 2006 14:23:20 +0000 (14:23 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 2 Dec 2006 14:23:20 +0000 (14:23 +0000)
     and 'd81c245727e82ac6bf504ee9f1084a1c1829c092'


Trivial merge