Merge 3.8 changes up to main-promo-2013.09.30-C1.1
Dan Willemsen [Tue, 1 Oct 2013 18:20:23 +0000 (11:20 -0700)]
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>


Trivial merge