Merge branch 'MAINT_3_4_1' into QA_3_4
commitbed8707eea1d20d1d9abda41182389c07a16d190
authorMarc Delisle <marc@infomarc.info>
Tue, 17 May 2011 11:23:15 +0000 (17 07:23 -0400)
committerMarc Delisle <marc@infomarc.info>
Tue, 17 May 2011 11:23:15 +0000 (17 07:23 -0400)
tree67bed40158d4833d7f96be9a01feb44b2a21018c
parent65c38cce309babaffd1154d21f6d1f907520b4a1
parent46245d0c9b20e216a42d6396f03f0bebdbb30f91
Merge branch 'MAINT_3_4_1' into QA_3_4