jyuenatsolarsoft/Lab — pull request #5 by jyuenatsolarsoft (2012-10-04 14:21:42+00:00)
Title: test straight merge from feature branch without on unchanged master.

Test conflict-free merge on the unchanged master