Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Thu, 18 Nov 2010 17:35:58 +0000 (12:35 -0500)
committerJim Pryor <profjim@jimpryor.net>
Thu, 18 Nov 2010 17:35:58 +0000 (12:35 -0500)

Trivial merge