merge of '4b8b5099e580dc976fa1eb82cf2b1d9e1dd32d3e'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 19 Oct 2006 10:59:14 +0000 (10:59 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 19 Oct 2006 10:59:14 +0000 (10:59 +0000)
     and '8e601c26b709250cd8e3d1fe31370969df1f715a'


Trivial merge