From: Ryan C. Gordon <icculus@icculus.org>
Date: Wed, 12 May 2010 23:09:17 +0000 (-0400)
Subject: Merge to mainline.
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=d127a872a5d1820b864c11ea501438b68d94da89;p=lugaru.git

Merge to mainline.
---

d127a872a5d1820b864c11ea501438b68d94da89