merge
authorBrad Beckmann <Brad.Beckmann@amd.com>
Mon, 1 Feb 2010 06:28:13 +0000 (22:28 -0800)
committerBrad Beckmann <Brad.Beckmann@amd.com>
Mon, 1 Feb 2010 06:28:13 +0000 (22:28 -0800)

Trivial merge