merge of '697fec81441b0b917323c2bac556f686813d0440'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 20 Nov 2006 09:31:29 +0000 (09:31 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 20 Nov 2006 09:31:29 +0000 (09:31 +0000)
     and 'e7c3c58ffc25bb74008c4dda3d77ba4eae16e8f0'


Trivial merge