Merge branch '7.8'
authorIan Romanick <ian.d.romanick@intel.com>
Fri, 23 Apr 2010 18:52:14 +0000 (11:52 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Fri, 23 Apr 2010 18:52:14 +0000 (11:52 -0700)

Trivial merge