Merge branch '7.8'
authorIan Romanick <ian.d.romanick@intel.com>
Mon, 5 Apr 2010 06:07:30 +0000 (23:07 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Mon, 5 Apr 2010 06:07:30 +0000 (23:07 -0700)

Trivial merge