Merge branch 'QA_3_4'
commit15e0b38073a02c38a67459ceb3bbab4f3b935b03
authorMarc Delisle <marc@infomarc.info>
Fri, 20 May 2011 16:55:55 +0000 (20 12:55 -0400)
committerMarc Delisle <marc@infomarc.info>
Fri, 20 May 2011 16:55:55 +0000 (20 12:55 -0400)
treef4cd90768cc5482c46746c74dea69ceb7e9753b7
parenta4c168a3a35bbdbf058a2e6fd1d2673c52821279
parent20cf17923e321718aa6d19fb9dc846625c1879fb
Merge branch 'QA_3_4'
ChangeLog