Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Thu, 2 Jun 2011 23:46:36 +0000 (19:46 -0400)
committerJim Pryor <profjim@jimpryor.net>
Thu, 2 Jun 2011 23:46:36 +0000 (19:46 -0400)

Trivial merge