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)
commitf343e9fff25f88a986decc37872a60ced1f9ee27
tree325a4c68f194bb611239513b79f96b4b0d28a58f
parent3945a6db23241d715cddf8f517ed8d915859d5ba
parent6283800eb68b451a3c68f754c711cec831c8c71a
Merge ... '3ac74c1bd7ff1bde609181b634938ce9bed0a3d3'
     and 'd8ef77dd104e8911dc8beccf81f4e0d3acd93ba5'