Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Tue, 22 Feb 2011 15:32:46 +0000 (10:32 -0500)
committerJim Pryor <profjim@jimpryor.net>
Tue, 22 Feb 2011 15:32:46 +0000 (10:32 -0500)

Trivial merge