pika/pika — pull request #170 by charleslaw (2012-09-04 16:59:17+00:00)
Title: Merge in bugfixes

Specifically commit a5812de1f596e7046b23805ad2fcf5f07390c4f7