Merge branch 'master' of ssh://opencfd@repo.or.cz/srv/git/OpenFOAM-1.6.x