technoweenie/guillotine — pull request #10 by technoweenie (2012-08-16 16:44:56+00:00)
Title: Rajeshucsb master

Combine #7 and #8. Should renumber this to 15 :)