Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Mon, 30 May 2011 09:57:00 +0000 (05:57 -0400)
committerJim Pryor <profjim@jimpryor.net>
Mon, 30 May 2011 09:57:00 +0000 (05:57 -0400)

Trivial merge