merge of '3ac74c1bd7ff1bde609181b634938ce9bed0a3d3'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 18 Dec 2006 11:51:39 +0000 (11:51 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 18 Dec 2006 11:51:39 +0000 (11:51 +0000)
     and 'd8ef77dd104e8911dc8beccf81f4e0d3acd93ba5'


Trivial merge