merge of '3dba2b4dd503fad1d9b3136a589986975da39964'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 15 Nov 2007 14:32:51 +0000 (14:32 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 15 Nov 2007 14:32:51 +0000 (14:32 +0000)
     and '876cf34988f6abf7cf9c048909f2a017a4582a61'


Trivial merge