[paraview/f15: 2/2] Merge branch 'master' into f15

[Orion Poplawski]

commit 0f3d42cca3fa4c0caef52accbbe72046cca02b3b
Merge: 68e280f 41ae4e2
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Wed Feb 29 15:45:54 2012 -0700

    Merge branch 'master' into f15

 paraview.spec          |   18 ++++++++++--------
 vtk-5.6.1-system.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 8 deletions(-)
---