Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Tue, 2 Nov 2010 11:49:10 +0000 (07:49 -0400)
committerJim Pryor <profjim@jimpryor.net>
Tue, 2 Nov 2010 11:49:10 +0000 (07:49 -0400)

Trivial merge