commit d3d91e52c164599bfb52cb85bddb7ccf91c26972 Merge: 36d8521 4483275 Author: Peter Robinson <pbrobinson at gmail.com> Date: Sat Jul 28 10:48:59 2012 +0100 fix merge ---