Merge git://github.com/briantrice/slate-language into timmy
authortimmy <timmy@timmy-desktop.(none)>
Thu, 18 Mar 2010 03:27:37 +0000 (23:27 -0400)
committertimmy <timmy@timmy-desktop.(none)>
Thu, 18 Mar 2010 03:27:37 +0000 (23:27 -0400)

Trivial merge