Merge branch 'master' of git://github.com/teiid/teiid
Merge branch 'master' of git://github.com/teiid/teiid
Merge branch 'master' of git://github.com/teiid/teiid