jyuenatsolarsoft/Lab — pull request #4 by jyuenatsolarsoft (2012-10-04 14:12:31+00:00)
Title: test straight merge with changed master

test merge without conflicts on updated master.