Merge branch 'MAINT_3_4_0' into QA_3_4
commitb5d235593a24cb469d651a9df0d41305946eab07
authorMarc Delisle <marc@infomarc.info>
Tue, 10 May 2011 13:31:06 +0000 (10 09:31 -0400)
committerMarc Delisle <marc@infomarc.info>
Tue, 10 May 2011 13:31:06 +0000 (10 09:31 -0400)
treeda46fbd7e4732d4f1db2aef57ae7f370c4c30286
parentf56619e48251f1745d3f6bc51711fa789822a836
parentb5e544536dff0f8a19b9e67cd149185a2e3c207d
Merge branch 'MAINT_3_4_0' into QA_3_4