Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Sat, 4 Jun 2011 11:25:09 +0000 (07:25 -0400)
committerJim Pryor <profjim@jimpryor.net>
Sat, 4 Jun 2011 11:25:09 +0000 (07:25 -0400)

Trivial merge