tree b5978d6349768cbf70b33366beb775ec0c6c3572
parent b00854d4c07ee8c810d1e32984543297bfa80a8e
author Nick Kralevich <nnk@google.com> 1276118863 -0700
committer Nick Kralevich <nnk@google.com> 1276191582 -0700

do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch

Change-Id: Ie20371234a531f65f523682a0d0c27394dc30afa