From: Francis Russell <francis@unchartedbackwaters.co.uk>
Date: Fri, 3 Aug 2012 23:37:43 +0000 (+0100)
Subject: Merge branch 'master' into generated.
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=cf8426c0e1e7b3b92dc6c0bffa228c0abc648e71;p=francis%2Fexcafe_benchmarks.git

Merge branch 'master' into generated.

Conflicts:
	laplacian_2d/Makefile
---

cf8426c0e1e7b3b92dc6c0bffa228c0abc648e71