Merge "Update changelog" into 2.0_beta
authorZhu, Peter <peter.j.zhu@intel.com>
Mon, 17 Sep 2012 15:33:58 +0000 (08:33 -0700)
committerGerrit Code Review <gerrit2@tzgerrit>
Mon, 17 Sep 2012 15:33:58 +0000 (08:33 -0700)

Trivial merge