taglib/taglib — pull request #135 by TsudaKageyu (2013-04-16 05:26:53+00:00)
Title: Merge branch 'master' into taglib2

to settle the conflicts I have caused.