[ruby-cvs:52207] naruse:r45062 (ruby_2_1): merge revision(s) 44654: [Backport #9426]

[naruse at ruby-lang.org]

naruse	2014-02-20 16:30:24 +0900 (Thu, 20 Feb 2014)

  New Revision: 45062

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=45062

  Log:
    merge revision(s) 44654: [Backport #9426]
    
    tracepoint.c: disable tracepoint
    
    * ext/-test-/tracepoint/tracepoint.c (tracepoint_track_objspace_events):
      ensure tracepoint disabled.  [ruby-dev:47901] [Bug #9426]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ext/-test-/tracepoint/tracepoint.c
    branches/ruby_2_1/version.h