Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Tue, 23 Nov 2010 00:57:29 +0000 (19:57 -0500)
committerJim Pryor <profjim@jimpryor.net>
Tue, 23 Nov 2010 00:57:29 +0000 (19:57 -0500)

Trivial merge