merge from upstream

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

diff --cc deal.II/include/deal.II/base/geometry_info.h
Simple merge

diff --cc deal.II/include/deal.II/dofs/dof_tools.h
Simple merge

diff --cc deal.II/include/deal.II/grid/grid_tools.h
Simple merge

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

diff --cc deal.II/source/dofs/dof_tools.cc
Simple merge

diff --cc deal.II/source/dofs/dof_tools.inst.in
Simple merge

diff --cc deal.II/source/grid/grid_tools.cc
Simple merge

diff --cc deal.II/source/lac/trilinos_sparse_matrix.cc
Simple merge