Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Mon, 4 Oct 2010 16:07:40 +0000 (12:07 -0400)
committerJim Pryor <profjim@jimpryor.net>
Mon, 4 Oct 2010 16:07:40 +0000 (12:07 -0400)

Trivial merge