Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Sun, 3 Oct 2010 19:42:28 +0000 (15:42 -0400)
committerJim Pryor <profjim@jimpryor.net>
Sun, 3 Oct 2010 19:42:28 +0000 (15:42 -0400)

Trivial merge