Automated merge with ssh://hsul@localhost:4444//repo/m5
authorLisa Hsu <Lisa.Hsu@amd.com>
Mon, 18 Jan 2010 22:33:02 +0000 (14:33 -0800)
committerLisa Hsu <Lisa.Hsu@amd.com>
Mon, 18 Jan 2010 22:33:02 +0000 (14:33 -0800)

Trivial merge