commit 4795ec7fdf902867bff270b2f3553e2f8bb0d0b6 Merge: 662b914 7c4d230 Author: Adam Goode <adam at spicenitz.org> Date: Fri Jul 30 10:50:11 2010 -0400 Merge remote branch 'origin/master' into f14 ---