Merge pull request #1 from openmrs/master

updating my trunk