Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Sat, 4 Dec 2010 19:05:22 +0000 (14:05 -0500)
committerJim Pryor <profjim@jimpryor.net>
Sat, 4 Dec 2010 19:05:22 +0000 (14:05 -0500)

Trivial merge