From: Jim Pryor <profjim@jimpryor.net>
Date: Wed, 1 Jun 2011 09:19:12 +0000 (-0400)
Subject: Merge branch 'pryor'
X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=commitdiff_plain;h=306be0fba5f3d1edde6efae28cf585dc63550cdc

Merge branch 'pryor'
---

306be0fba5f3d1edde6efae28cf585dc63550cdc