From: Jim Pryor <profjim@jimpryor.net>
Date: Tue, 24 Aug 2010 19:30:15 +0000 (-0400)
Subject: Merge branch 'pryor'
X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=commitdiff_plain;h=cf6cc4a531cc748ec334d2610e3cf1e9bcc2514c

Merge branch 'pryor'
---

cf6cc4a531cc748ec334d2610e3cf1e9bcc2514c