Merge branch 'master' of ssh://erxz.com/~/git_repo/stem
Uri Guttman [Tue, 15 Sep 2009 17:58:08 +0000 (13:58 -0400)]

Trivial merge