tree a1e2c795cd45f1cc366f71c9e371993566bb2898
parent c079dfe4153941e6da881be9a143b41a1112c2ac
parent 83697b8b76501cc09b3f1963485184bc7cae06ee
author Nick Kralevich <nnk@google.com> 1353023835 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1353023835 -0800

Merge "Temporarily address gcc 4.7 breakage."