Merge pull request #36 from briand/working
authorarthurwolf <wolf.arthur@gmail.com>
Tue, 29 May 2012 10:35:19 +0000 (03:35 -0700)
committerarthurwolf <wolf.arthur@gmail.com>
Tue, 29 May 2012 10:35:19 +0000 (03:35 -0700)
A clean cherry-pick of work so far. Each commit speaks for itself, I think.


Trivial merge