Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Thu, 16 Sep 2010 01:21:34 +0000 (21:21 -0400)
committerJim Pryor <profjim@jimpryor.net>
Thu, 16 Sep 2010 01:21:34 +0000 (21:21 -0400)

Trivial merge