Merge branch 'master' of steve@erxz.com:/home/uri/git_repo/stem
Steve Scaffidi [Tue, 22 Sep 2009 22:01:25 +0000 (18:01 -0400)]

Trivial merge