Automated merge with ssh://hg@m5sim.org/m5
authorDerek Hower <drh5@cs.wisc.edu>
Thu, 13 Aug 2009 15:37:37 +0000 (10:37 -0500)
committerDerek Hower <drh5@cs.wisc.edu>
Thu, 13 Aug 2009 15:37:37 +0000 (10:37 -0500)
1  2 
src/mem/ruby/config/cfg.rb

Simple merge