submit/2.0/20130321.072048
object 21e69522e53717a96759d43637fd7e7b35542c68
authorZhao Halley <halley.zhao@intel.com>
Thu, 21 Mar 2013 07:20:48 +0000 (15:20 +0800)
rebase to recent upstream code for upstream/2.0 branch