Module: ppl/ppl Branch: MPI Commit: 9c2a7cf107a17a07e5076e25577a69260a583b6e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9c2a7cf107a17... Author: Marco Poletti <poletti.marco@gmail.com> Date: Mon Sep 20 09:18:34 2010 +0200 Merge remote branch 'origin/sparse_matrices' into MPI Conflicts: src/CO_Tree.templates.hh ---