fixing the merge

This commit is contained in:
Joe Bowser 2010-06-09 10:26:06 -07:00
commit bde54704d3