Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Sun, 20 Feb 2011 14:10:09 +0000 (09:10 -0500)
committerJim Pryor <profjim@jimpryor.net>
Sun, 20 Feb 2011 14:10:09 +0000 (09:10 -0500)

Trivial merge