Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Sun, 6 Mar 2011 18:05:37 +0000 (13:05 -0500)
committerJim Pryor <profjim@jimpryor.net>
Sun, 6 Mar 2011 18:05:37 +0000 (13:05 -0500)

Trivial merge