Commit eb60ca55f1966ace2a1655cdb6883cc3151fe9c5

nelisky 2012-05-04T04:11:08

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