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

Trivial merge