From: Jim Pryor <profjim@jimpryor.net>
Date: Tue, 7 Dec 2010 22:20:27 +0000 (-0500)
Subject: Merge branch 'pryor'
X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=commitdiff_plain;h=2214dd1acc23cde1348206b9ed29200670cc4abf

Merge branch 'pryor'
---

2214dd1acc23cde1348206b9ed29200670cc4abf