Merge branch 'MAINT_3_4_1' into QA_3_4
commit20cf17923e321718aa6d19fb9dc846625c1879fb
authorMarc Delisle <marc@infomarc.info>
Fri, 20 May 2011 16:55:32 +0000 (20 12:55 -0400)
committerMarc Delisle <marc@infomarc.info>
Fri, 20 May 2011 16:55:32 +0000 (20 12:55 -0400)
tree8217f2d8c95860d0d99984c8177285380235d78f
parent8fd8e3efd86b119ca5be7aaa9e047c92bfd06c23
parent89c8f3cbfe5356995ad71e5a41438e81fa994a55
Merge branch 'MAINT_3_4_1' into QA_3_4
ChangeLog