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

Trivial merge