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)
commit1318848f782cce716d6376ca13aebf68b728e24c
treec7b8ffee05085d3846b656b0369c346a2f2546ef
parentefc69ca61cf8fe7d2d44d177e7737999b6a114b5
parent157bdd1446dd21cc87a89abdc890b2f6dc83af76
Merge branch '7.8'