Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Thu, 16 Sep 2010 01:30:30 +0000 (21:30 -0400)
committerJim Pryor <profjim@jimpryor.net>
Thu, 16 Sep 2010 01:30:30 +0000 (21:30 -0400)

Trivial merge