merge of '575362d4559ed152d30fb5c13f83010cf658bf44'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 7 Dec 2006 20:27:31 +0000 (20:27 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 7 Dec 2006 20:27:31 +0000 (20:27 +0000)
     and '5d137a82f802924d6d6e3a578800021b392244d9'


Trivial merge