Commit 8a24b79eff663677eb258dc1d803c4636873de08

nelisky 2012-05-03T01:26:58

Merge remote-tracking branch 'upstream/master' into ztex-120417