Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Sun, 29 May 2011 17:58:47 +0000 (13:58 -0400)
committerJim Pryor <profjim@jimpryor.net>
Sun, 29 May 2011 17:58:47 +0000 (13:58 -0400)

Trivial merge