make the inner solver a pointer to a generic Solver class, in anticipation of using a truncated cg there

[[Imported from SVN: r4102]]