Merge from mainline.

git-svn-id: https://svn.dealii.org/branches/branch_paralution@31958 0785d39b-7218-0410-832d-ea1e28bc413d

diff --cc deal.II/cmake/config/CMakeLists.txt
Simple merge

diff --cc deal.II/cmake/scripts/run_testsuite.cmake
Simple merge

diff --cc deal.II/include/deal.II/lac/sparse_matrix.h
Simple merge

diff --cc deal.II/include/deal.II/lac/trilinos_vector_base.h
Simple merge