commit a4bb76125337760fd54f523059534e040a326734 Merge: 1070964 a4c8347 Author: Stu Tomlinson <stu at espresso.gravel> Date: Wed Aug 11 13:37:52 2010 +0100 Merge remote branch 'origin/f12/master' ---