Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Sat, 27 Nov 2010 04:26:41 +0000 (23:26 -0500)
committerJim Pryor <profjim@jimpryor.net>
Sat, 27 Nov 2010 04:26:41 +0000 (23:26 -0500)

Trivial merge