Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Wed, 15 Sep 2010 21:09:49 +0000 (17:09 -0400)
committerJim Pryor <profjim@jimpryor.net>
Wed, 15 Sep 2010 21:09:49 +0000 (17:09 -0400)

Trivial merge