tree f703c068e2a037d12dac592e1ebc6f1849ce4fbf
parent d170fc48b0895ee98ec0d6e3cf1987c8260af95d
author Brian Carlstrom <bdc@google.com> 1326160916 -0800
committer Brian Carlstrom <bdc@google.com> 1326172850 -0800

Changes to compile with gcc 4.6

Change-Id: I55908b3b98b49373ce948fd1f12e0a5cd56ae4f7