Merge branch 'for-3.0' into for-3.1
Mark Brown [Thu, 7 Jul 2011 16:54:19 +0000 (09:54 -0700)]

Trivial merge