Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Tue, 7 Dec 2010 22:20:27 +0000 (17:20 -0500)
committerJim Pryor <profjim@jimpryor.net>
Tue, 7 Dec 2010 22:20:27 +0000 (17:20 -0500)

Trivial merge