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

Trivial merge