commit 46c64c1ff7a048d67a20623e252e76fae7e43cb5 Merge: 02954b9 ce34179 Author: Nathanael D. Noblet <nathanael at gnat.ca> Date: Sun Sep 11 20:40:07 2011 -0600 fixed conflicted spec ---