Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Mon, 4 Oct 2010 00:38:44 +0000 (20:38 -0400)
committerJim Pryor <profjim@jimpryor.net>
Mon, 4 Oct 2010 00:38:44 +0000 (20:38 -0400)

Trivial merge