Merge branch 'MAINT_3_4_7' into QA_3_4
commitbdfd9ead762a3003dcbdbb043a3288bfe1f1eecc
authorMarc Delisle <marc@infomarc.info>
Sun, 23 Oct 2011 12:09:23 +0000 (23 08:09 -0400)
committerMarc Delisle <marc@infomarc.info>
Sun, 23 Oct 2011 12:09:23 +0000 (23 08:09 -0400)
tree5cf7a1ac96c13cc4fab4c14b7fd063b822ff76d3
parent0112ff6ba522b6d18fee298357a3fda1d9cea0cf
parenta8a93c3e5af85dd0329e1a71b8bed664c9ec4bc2
Merge branch 'MAINT_3_4_7' into QA_3_4