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

Trivial merge