Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Mon, 4 Oct 2010 01:14:50 +0000 (21:14 -0400)
committerJim Pryor <profjim@jimpryor.net>
Mon, 4 Oct 2010 01:14:50 +0000 (21:14 -0400)

Trivial merge