Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Tue, 30 Nov 2010 21:21:03 +0000 (16:21 -0500)
committerJim Pryor <profjim@jimpryor.net>
Tue, 30 Nov 2010 21:21:03 +0000 (16:21 -0500)

Trivial merge