mozilla/butter — pull request #117 by secretrobotron (2012-03-27 16:19:54+00:00)
Title: T526

Tests were broken after a strange merge.