Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Wed, 1 Jun 2011 04:25:14 +0000 (00:25 -0400)
committerJim Pryor <profjim@jimpryor.net>
Wed, 1 Jun 2011 04:25:14 +0000 (00:25 -0400)

Trivial merge