merges r30817 from trunk into ruby_1_9_2.

--
	* lib/benchmark.rb (Benchmark#bmbm): use ensure clause instead of
	  Object#tap to restore STDOUT.sync.

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

1 files changed, 2 insertions, 1 deletions

diff --git a/lib/benchmark.rb b/lib/benchmark.rb
index 8e7f778e2d..d06b434c65 100644
--- a/lib/benchmark.rb
+++ b/lib/benchmark.rb
@@ -281,8 +281,9 @@ module Benchmark
       list.push [label, res]
     }
 
-    STDOUT.sync = sync
     ary
+  ensure
+    STDOUT.sync = sync unless sync.nil?
   end
 
   #