[paraview/f21: 7/7] Merge branch 'master' into f21

[Orion Poplawski]

commit a370829e023be871afb7ee8df28032b4509072c1
Merge: b74b30d 1747f4d
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Tue Feb 3 12:02:43 2015 -0700

    Merge branch 'master' into f21

 .gitignore             |    1 +
 paraview-headers.patch |   28 ++++++++++++++++------------
 paraview.spec          |   24 ++++++++++++++++++------
 sources                |    2 +-
 vtk-6.1.0-system.patch |   27 ---------------------------
 vtk-type.patch         |   23 +++++++++++++++++++++++
 6 files changed, 59 insertions(+), 46 deletions(-)
---