qgis - Revision 15954: /tags/merged-0_5-branch_to_trunk