Merge commit 'xceiv-for-v3.7' into for-3.7/cleanup2
authorStephen Warren <swarren@nvidia.com>
Fri, 14 Sep 2012 17:35:16 +0000 (11:35 -0600)
committerStephen Warren <swarren@nvidia.com>
Fri, 14 Sep 2012 17:35:16 +0000 (11:35 -0600)

Trivial merge