Teiid-Designer/teiid-designer — pull request #390 by tejones (2014-07-23 19:50:58+00:00)
Title: teiiddes-1882

Fixes merge issues