Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Sat, 4 Dec 2010 20:41:00 +0000 (15:41 -0500)
committerJim Pryor <profjim@jimpryor.net>
Sat, 4 Dec 2010 20:41:00 +0000 (15:41 -0500)

Trivial merge