commit aa34525c578d33f58226a7f859a046e534eafa73 Merge: 5e71687 823b26b Author: Stu Tomlinson <stu at nosnilmot.com> Date: Thu Jul 5 18:10:36 2012 +0100 Merge branch 'f17' ---