Merge remote branch 'remotes/origin/hotfix/ThirdParty_useSystemInstalledPackages'
commit13cfb416bba40a4385151bff3b5abfa471a79532
authorHrvoje Jasak <h.jasak@wikki.co.uk>
Thu, 16 Dec 2010 22:56:57 +0000 (16 22:56 +0000)
committerHrvoje Jasak <h.jasak@wikki.co.uk>
Thu, 16 Dec 2010 22:56:57 +0000 (16 22:56 +0000)
treeae4dae37ea55f935f71f7acfa35a2bf445ead17c
parent974b5ed28b919cc666268117e2a0e95164beece7
parentb9adfe2d6f7f13ef061e45e21b6b51003896ea29
Merge remote branch 'remotes/origin/hotfix/ThirdParty_useSystemInstalledPackages'

Conflicts:
ThirdParty/rpmBuild/SPECS/ParaView-3.8.1.spec
ThirdParty/rpmBuild/SPECS/openmpi-1.4.3.spec
ThirdParty/rpmBuild/SPECS/ParaView-3.8.1.spec