manual merge of conflict
Change all PETSC_EXTERN_C to PETSC_EXTERNHg-commit: 8d2ebbb193fb583bccc64015e35640c4e08c3426
finished all EXTERN_C_BEGIN/END fixes up through Mat including all fortran interface filesHg-commit: a763120ba50023930be975663a3f80c58e415743
Uncrustified src/ksp/pc/*Hg-commit: b80b33e3b1d8943a898b18384bc7b2c1a3103a32
Replaced remaining '){' with ') {'.Hg-commit: f4f35e45a9688d9cbe30c43558c5cab041b08998
reemove OBJSC and OBJSF from invididual makefiles and auto-define in conf/variablesHg-commit: 2f01c17f3c19dc4b89aaf306cfd60a12312c270d
new fortran interfaceHg-commit: 4a6638305aacc052919d0dcea60bf9ed7e619628
12