Merge from mainline.

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

diff --cc deal.II/examples/step-42/step-42.cc
Simple merge

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

diff --cc deal.II/include/deal.II/lac/slepc_solver.h
index c843c90ebfde291d5d84202a07bc0acca8c5e12d,5554e5ffe61c24661e3053ebdf6371997af57ec6..d8c5ebad0d40dd77f3a57b64dd1ff46f56327fa3
--- 1/deal.II/include/deal.II/lac/slepc_solver.h
--- 2/deal.II/include/deal.II/lac/slepc_solver.h
+++ b/deal.II/include/deal.II/lac/slepc_solver.h
@@@ -147,7 -143,7 +147,7 @@@ namespace SLEPcWrapper
      solve (const PETScWrappers::MatrixBase &A,
             std::vector<double>             &kr,
             std::vector<OutputVector>       &vr,
-            const size_type                  n_eigenvectors);
 -           const unsigned int              n_eigenvectors = 1);
++           const size_type                  n_eigenvectors = 1);
  
      /**
       * Same as above, but here a composite method for solving the
@@@ -159,7 -155,7 +159,7 @@@
             const PETScWrappers::MatrixBase &B,
             std::vector<double>             &kr,
             std::vector<OutputVector>       &vr,
-            const size_type                  n_eigenvectors);
 -           const unsigned int               n_eigenvectors = 1);
++           const size_type                  n_eigenvectors = 1);
  
      /**
       * Initialize solver for the linear system $Ax=\lambda x$. (Note:
@@@ -658,7 -654,7 +658,7 @@@
    SolverBase::solve (const PETScWrappers::MatrixBase &A,
                       std::vector<double>             &kr,
                       std::vector<OutputVector>       &vr,
-                      const size_type                  n_eigenvectors = 1)
 -                     const unsigned int               n_eigenvectors)
++                     const size_type                  n_eigenvectors)
    {
      // Panic if no eigenpairs are wanted.
      AssertThrow (n_eigenvectors != 0, ExcSLEPcWrappersUsageError());
@@@ -690,7 -686,7 +690,7 @@@
                       const PETScWrappers::MatrixBase &B,
                       std::vector<double>             &kr,
                       std::vector<OutputVector>       &vr,
-                      const size_type                  n_eigenvectors = 1)
 -                     const unsigned int               n_eigenvectors)
++                     const size_type                  n_eigenvectors)
    {
      // Panic if no eigenpairs are wanted.
      AssertThrow (n_eigenvectors != 0, ExcSLEPcWrappersUsageError());