mozilla/butter — pull request #391 by humphd (2012-06-05 17:55:23+00:00)
Title: T1296 v0.5.x

Rebased for 0.5.x