Commit a6dce875de7719a0dd41e7df36bd2688b2456beb

Con Kolivas 2012-12-02T01:41:21

Merge pull request #335 from denis2342/ztex ztex locking fix and cosmetic changes