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

Trivial merge