tokyo/tokyo — pull request #2 by strohel (2012-03-12 20:49:41+00:00)
Title: Merge module branch into master

Artificial merge to let me comment on code.