Merge "Changelog update"
authorTracy Graydon <tracy.graydon@intel.com>
Wed, 29 Feb 2012 01:48:20 +0000 (17:48 -0800)
committerGerrit Code Review <gerrit2@localhost>
Wed, 29 Feb 2012 01:48:20 +0000 (17:48 -0800)

Trivial merge