Merge branch 'MAINT_3_4_0' into QA_3_4
commit91404354e42c082e16e2341e9cc14e1844cfa9a5
authorMarc Delisle <marc@infomarc.info>
Tue, 30 Nov 2010 17:46:08 +0000 (30 12:46 -0500)
committerMarc Delisle <marc@infomarc.info>
Tue, 30 Nov 2010 17:46:08 +0000 (30 12:46 -0500)
treea513fe239caab661d881155d0e89f9cff3baa7fc
parent049eac2885fda4e056aeb7ca283c52f5a72cfaae
parentb6fcdb32f890889c858f45eeba09d2104ab15261
Merge branch 'MAINT_3_4_0' into QA_3_4