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

Trivial merge