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

...olvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C

...ons/solvers/heatTransfer/buoyantSimpleFoam/createFields.H

applications/solvers/heatTransfer/thermoFoam/EEqn.H

applications/solvers/heatTransfer/thermoFoam/Make/files

applications/solvers/heatTransfer/thermoFoam/Make/options

applications/solvers/heatTransfer/thermoFoam/createFields.H

applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H

applications/solvers/heatTransfer/thermoFoam/thermoFoam.C

applications/solvers/multiphase/cavitatingFoam/Make/options

.../multiphase/cavitatingFoam/cavitatingDyMFoam/Make/options

...hase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C

...olvers/multiphase/cavitatingFoam/cavitatingDyMFoam/pEqn.H

...ations/solvers/multiphase/cavitatingFoam/cavitatingFoam.C

...ations/solvers/multiphase/cavitatingFoam/continuityErrs.H

...ications/solvers/multiphase/cavitatingFoam/createFields.H

applications/solvers/multiphase/cavitatingFoam/gammaPsi.H

applications/solvers/multiphase/cavitatingFoam/pEqn.H

...ations/solvers/multiphase/compressibleInterFoam/Allwclean

...cations/solvers/multiphase/compressibleInterFoam/Allwmake

...ons/solvers/multiphase/compressibleInterFoam/Make/options