Merge branch '7.8'
authorJesse Barnes <jbarnes@virtuousgeek.org>
Mon, 19 Apr 2010 21:20:58 +0000 (14:20 -0700)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Mon, 19 Apr 2010 21:20:58 +0000 (14:20 -0700)

Trivial merge