commit abfe8ca34c89e58e5a9bbebaf72a02970b43a927 Merge: 6a900d7 a64442e 6ed19ce Author: Adam Goode <adam at spicenitz.org> Date: Fri Jul 30 11:46:40 2010 -0400 Merge branches 'f12', 'f13' and 'f14' ---