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

Trivial merge