commit 7c2dcbfd8f25f6b89b4592e9b5ec46b3984ae617 Merge: 14e0371 0d51562 Author: Adam Goode <adam at spicenitz.org> Date: Fri Jul 30 10:51:38 2010 -0400 Merge branch 'f14' ---