Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Sat, 18 Sep 2010 21:31:59 +0000 (17:31 -0400)
committerJim Pryor <profjim@jimpryor.net>
Sat, 18 Sep 2010 21:31:59 +0000 (17:31 -0400)

Trivial merge