Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Tue, 14 Sep 2010 02:35:17 +0000 (22:35 -0400)
committerJim Pryor <profjim@jimpryor.net>
Tue, 14 Sep 2010 02:35:17 +0000 (22:35 -0400)

Trivial merge