[paraview/f16: 3/3] Merge branch 'master' into f16

[Orion Poplawski]

commit b2b0c9d6b9f504cc182039cfb2378da608ee68ae
Merge: e5f10ce f798716
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Thu Dec 1 20:31:14 2011 -0700

    Merge branch 'master' into f16

 paraview.spec |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 deletions(-)
---