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

Trivial merge