Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Sat, 2 Oct 2010 12:23:49 +0000 (08:23 -0400)
committerJim Pryor <profjim@jimpryor.net>
Sat, 2 Oct 2010 12:23:49 +0000 (08:23 -0400)

Trivial merge