Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Mon, 25 Oct 2010 12:00:30 +0000 (08:00 -0400)
committerJim Pryor <profjim@jimpryor.net>
Mon, 25 Oct 2010 12:00:30 +0000 (08:00 -0400)

Trivial merge