Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Sat, 26 Feb 2011 17:08:27 +0000 (12:08 -0500)
committerJim Pryor <profjim@jimpryor.net>
Sat, 26 Feb 2011 17:08:27 +0000 (12:08 -0500)

Trivial merge