commit 0f6e0d5d26da0b0dcd9ece5bf102c342fe3e129b Merge: 4d9046e c72ba18 Author: T.C. Hollingsworth <tchollingsworth at gmail.com> Date: Tue Mar 12 16:24:31 2013 -0700 fix my bad git-fu ---