Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Thu, 16 Sep 2010 00:58:49 +0000 (20:58 -0400)
committerJim Pryor <profjim@jimpryor.net>
Thu, 16 Sep 2010 00:58:49 +0000 (20:58 -0400)

Trivial merge