Merge branch 'master' into cuda_concurrency
authorErnest Galbrun <ernest.galbrun@univ-lorraine.fr>
Thu, 31 Jul 2014 14:03:51 +0000 (16:03 +0200)
committerErnest Galbrun <ernest.galbrun@univ-lorraine.fr>
Thu, 31 Jul 2014 14:03:51 +0000 (16:03 +0200)

Trivial merge