commit 0b15c98c0e6aeaffc93a20f55b11892bdc2b0747 Merge: a41c925 b1d91b8 Author: Richard Fearn <richardfearn at gmail.com> Date: Sat Oct 9 20:31:14 2010 +0100 Merge branch 'master' into f13 ---