[QGIS Commit] [qgis/Quantum-GIS] 5e0766: apply Merge Shapefiles fixes from master

[GitHub]

  Branch: refs/heads/release-1_7
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: 5e0766729b1f292eef750a85ea3a4b0e11e42f67
      https://github.com/qgis/Quantum-GIS/commit/5e0766729b1f292eef750a85ea3a4b0e11e42f67
  Author: Alexander Bruy <alexander.bruy at gmail.com>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    M python/plugins/fTools/tools/doMergeShapes.py
  M python/plugins/fTools/tools/ftools_utils.py

  Log Message:
  -----------
  apply Merge Shapefiles fixes from master