Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Tue, 24 Aug 2010 02:44:10 +0000 (22:44 -0400)
committerJim Pryor <profjim@jimpryor.net>
Tue, 24 Aug 2010 02:44:10 +0000 (22:44 -0400)

Trivial merge