merge of '696fafb88835f59c6692b229e898775cd7a46691'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 2 Apr 2007 09:58:18 +0000 (09:58 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 2 Apr 2007 09:58:18 +0000 (09:58 +0000)
     and 'b3b8e63b9c7a291ec7420fbeb711be2b70875547'


Trivial merge