Commit b53fa540b4c3e3e5d1e2c3f94bfdf6d7ba61d8c7

Con Kolivas 2012-12-08T12:38:58

Merge pull request #347 from denis2342/ztex Ztex: more whitespace and style fixes