pika/pika — pull request #346 by eandersson (2013-05-24 17:33:00+00:00)
Title: Alternative solution to fix #345. 

Not necessarily a better solution, but stays consistent with the previous code.