cheald/pismo — pull request #1 by bborn (2012-10-12 15:50:01+00:00)
Title: Merged your stuff in with the latest from Peterc

And made tests pass.