* ext/json: Merge json gem v1.5.4 (3dab4c5a6a97fac03dac).


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33143 b2dd03c8-39d4-4d8f-98ff-823fe69b080e