Merge branch 'MAINT_3_4_0' into QA_3_4
commit05931126744134ff1aa13e7104c87d428a756daf
authorMarc Delisle <marc@infomarc.info>
Mon, 29 Nov 2010 18:03:10 +0000 (29 13:03 -0500)
committerMarc Delisle <marc@infomarc.info>
Mon, 29 Nov 2010 18:03:10 +0000 (29 13:03 -0500)
treeb1e34c2034a0066f97ab34e81358aaf5957eb4d8
parent1b309ed30a8707f370fa0069dd2286c5eceadc3b
parentdff18d6af8c8bbc8ed13cd4032d5cfe4640811ea
Merge branch 'MAINT_3_4_0' into QA_3_4
ChangeLog