Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Mon, 27 Sep 2010 01:18:15 +0000 (21:18 -0400)
committerJim Pryor <profjim@jimpryor.net>
Mon, 27 Sep 2010 01:18:15 +0000 (21:18 -0400)

Trivial merge