Merge branch '7.8'
authorJesse Barnes <jbarnes@virtuousgeek.org>
Tue, 13 Apr 2010 16:40:14 +0000 (09:40 -0700)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Tue, 13 Apr 2010 16:40:14 +0000 (09:40 -0700)

Trivial merge