From: Francis Russell <francis@unchartedbackwaters.co.uk>
Date: Wed, 20 Jun 2012 17:22:48 +0000 (+0100)
Subject: Merge in intermediate handling from 'master'.
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=4f9a05c80e898116b62f7d96b4529f7a96e514e9;p=francis%2Fexcafe_benchmarks.git

Merge in intermediate handling from 'master'.
---

4f9a05c80e898116b62f7d96b4529f7a96e514e9