commit 1b54fc2c45cafd2f37ec818316fe93b309112a99 Merge: 5db5431 0b15c98 Author: Richard Fearn <richardfearn at gmail.com> Date: Sat Oct 9 20:58:38 2010 +0100 Merge branch 'f13' into f12 ---