Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Tue, 24 Aug 2010 15:42:17 +0000 (11:42 -0400)
committerJim Pryor <profjim@jimpryor.net>
Tue, 24 Aug 2010 15:42:17 +0000 (11:42 -0400)

Trivial merge