Merge branch 'MAINT_3_4_1' into QA_3_4
commit8fd8e3efd86b119ca5be7aaa9e047c92bfd06c23
authorMarc Delisle <marc@infomarc.info>
Fri, 20 May 2011 16:50:38 +0000 (20 12:50 -0400)
committerMarc Delisle <marc@infomarc.info>
Fri, 20 May 2011 16:50:38 +0000 (20 12:50 -0400)
treeaacdd50bc2d24ef89693ac3de23ed0d4352abf1d
parente22344168fa0c717538f78e4b4e5935dd78dc69d
parent7e10c132a3887c8ebfd7a8eee356b28375f1e287
Merge branch 'MAINT_3_4_1' into QA_3_4