Merge "Configuration updates:Making a clear distinction between Init and Change"
authorJohn Koleszar <jkoleszar@google.com>
Wed, 9 Mar 2011 13:07:11 +0000 (05:07 -0800)
committerCode Review <code-review@webmproject.org>
Wed, 9 Mar 2011 13:07:11 +0000 (05:07 -0800)

Trivial merge