Merge branch 'parsable'
authorPHO <pho@cielonegro.org>
Mon, 19 Dec 2011 14:30:51 +0000 (23:30 +0900)
committerPHO <pho@cielonegro.org>
Mon, 19 Dec 2011 14:30:51 +0000 (23:30 +0900)

Trivial merge