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

Trivial merge