Automated merge with ssh://repo.gem5.org/gem5
authorAli Saidi <Ali.Saidi@ARM.com>
Tue, 10 Jan 2012 16:18:08 +0000 (10:18 -0600)
committerAli Saidi <Ali.Saidi@ARM.com>
Tue, 10 Jan 2012 16:18:08 +0000 (10:18 -0600)

Trivial merge