melllvar/grr — pull request #6 by jimparis (2013-06-17 17:25:57+00:00)
Title: For upstream

Some minor fixes