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

Trivial merge