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

Trivial merge