merge revision(s) 34497:

------------------------------------------------------------------------
r34497 | naruse | 2012-02-09 03:29:52 +0900 (Thu, 09 Feb 2012) | 1 line

FreeBSD needs multiple -o.
------------------------------------------------------------------------


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

2 files changed, 4 insertions, 4 deletions

diff --git a/test/ruby/memory_status.rb b/test/ruby/memory_status.rb
index 9cee933be3..d0596ccd5e 100644
--- a/test/ruby/memory_status.rb
+++ b/test/ruby/memory_status.rb
@@ -59,7 +59,7 @@ module Memory
       end
     end
   else
-    PSCMD = ["ps", "-o", "vsz=,rss=", "-p"]
+    PSCMD = ["ps", "-ovsz=","-orss=", "-p"]
     PAT = /^\s*(\d+)\s+(\d+)$/
 
     keys << :size << :rss
diff --git a/version.h b/version.h
index 6b9895d287..0a43fbcf47 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 68
+#define RUBY_PATCHLEVEL 69
 
-#define RUBY_RELEASE_DATE "2012-02-08"
+#define RUBY_RELEASE_DATE "2012-02-09"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 8
+#define RUBY_RELEASE_DAY 9
 
 #include "ruby/version.h"