commit 70f70964505aedec9637a9fc8e4afc9016dde117 Merge: 0d11229 23a7eee Author: Adam Goode <adam at spicenitz.org> Date: Fri Jul 30 11:24:41 2010 -0400 Merge branch 'master' into f12 ---