Merge zizzer:/bk/m5

into  zeep.eecs.umich.edu:/z/saidi/work/m5

--HG--
extra : convert_revision : 3cc23080d19cc464a8ba7c1c93b6e5d45af7d463

diff --cc python/m5/objects/Ethernet.py
Simple merge

diff --cc util/pbs/send.py
Simple merge

diff --cc util/stats/stats.py
index 3f6d162bcd4f593a19513eeeaca56bbb90b9a7fc,e481a794ce9a8190b8fb628732eaafeb81579ce0..61f54dede9dfccb46ff2d6d863cc830c03d85e3d
--- 1/util/stats/stats.py
--- 2/util/stats/stats.py
+++ b/util/stats/stats.py
@@@ -177,11 -175,11 +175,11 @@@ def commands(options, command, args)
              merge = int(args[0])
          except ValueError:
              usage()
-         stats = info.source.getStat(args[1])
-         info.source.get = "sum"
+         stats = source.getStat(args[1])
+         source.method = 'sum'
  
          def disp(*args):
 -            print "%-20s %12s %12s %4s %5s %5s %5s %10s" % args
 +            print "%-35s %12s %12s %4s %5s %5s %5s %10s" % args
  
          # temporary variable containing a bunch of dashes
          d = '-' * 100