commit 14e0371e79b773fe287b1261956a275ab3999f94 Merge: b529311 93dba4b Author: Adam Goode <adam at spicenitz.org> Date: Fri Jul 30 10:49:01 2010 -0400 Merge remote branch 'origin/f12/master' ---