Merge branch 'fix-76179'
Andrew Rodland [Mon, 25 Jun 2012 19:50:04 +0000 (15:50 -0400)]

Trivial merge