commit ddd4230fbd1509b9a35298844be23e7d0e860eec Merge: 877dc97 919b570 Author: Nathaniel McCallum <nathaniel at natemccallum.com> Date: Fri Oct 8 23:12:24 2010 -0400 Merge branch 'f12' ---