Merge branch 'MAINT_3_4_6' into QA_3_4
commit7d586b458dbbaf4002ead84ef7edea60833c528c
authorMarc Delisle <marc@infomarc.info>
Mon, 3 Oct 2011 19:12:01 +0000 (3 15:12 -0400)
committerMarc Delisle <marc@infomarc.info>
Mon, 3 Oct 2011 19:12:01 +0000 (3 15:12 -0400)
treeb9ac0aee08daf04d634c7e280e2960a235c1c56d
parentfbaa5cc1a1cd4fbbb8588cda958c803b186eb064
parente05b37d3c9e5b99e8a779fe55780d92df17b4a55
Merge branch 'MAINT_3_4_6' into QA_3_4