commit 21e4a88c197a90f15997d29f146e786935368313 Merge: 30b82b6 d68587b Author: Stu Tomlinson <stu at nosnilmot.com> Date: Thu Dec 29 13:11:49 2011 +0000 Merge branch 'f16' ---