Merge branch 'feature_enable_disable_job'
authorjollychang <jollychang@gmail.com>
Wed, 19 Sep 2012 10:18:51 +0000 (18:18 +0800)
committerjollychang <jollychang@gmail.com>
Wed, 19 Sep 2012 10:18:51 +0000 (18:18 +0800)

Trivial merge