Merge branch '7.8'
authorBrian Paul <brianp@vmware.com>
Mon, 8 Mar 2010 18:43:20 +0000 (11:43 -0700)
committerBrian Paul <brianp@vmware.com>
Mon, 8 Mar 2010 18:43:20 +0000 (11:43 -0700)

Trivial merge