Merge branch 'QA_3_4'master
commit071bc679dbd8bd2ece5182bdb471c027f33daf6c
authorMarc Delisle <marc@infomarc.info>
Tue, 10 May 2011 13:32:21 +0000 (10 09:32 -0400)
committerMarc Delisle <marc@infomarc.info>
Tue, 10 May 2011 13:32:21 +0000 (10 09:32 -0400)
tree296a90fec5f5c336e3062365db71f096215f7c7b
parent7698df152041315049ad0e8b7db235e7fbbe7d7c
parentb5d235593a24cb469d651a9df0d41305946eab07
Merge branch 'QA_3_4'