commit 8ed608b6126bb7feb64b7d30144a758bbb534580 Merge: 32a9260 23a7eee Author: Adam Goode <adam at spicenitz.org> Date: Fri Jul 30 11:24:46 2010 -0400 Merge branch 'master' into f13 ---