Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

...cations/solvers/multiphase/multiphaseEulerFoam/Make/files

...tions/solvers/multiphase/multiphaseEulerFoam/Make/options

...s/solvers/multiphase/multiphaseEulerFoam/createMRFZones.H

applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H

applications/utilities/postProcessing/foamCalc/foamCalcApp.C

...laneous/execFlowFunctionObjects/execFlowFunctionObjects.C

...tProcessing/velocityField/streamFunction/streamFunction.C

etc/config/settings.csh

etc/config/settings.sh

src/finiteVolume/Make/files

...lActuationDiskSource/radialActuationDiskSourceTemplates.C

...xPressure/multiphaseFixedFluxPressureFvPatchScalarField.C

...xPressure/multiphaseFixedFluxPressureFvPatchScalarField.H

src/postProcessing/postCalc/postCalc.C

...pimpleDyMFoam/mixerVesselAMI2D/constant/polyMesh/boundary

...iphase/multiphaseEulerFoam/bubbleColumn/system/fvSolution

...hase/multiphaseEulerFoam/damBreak4phase/system/fvSolution

wmake/rules/General/mplibSGIMPI