tree 3794acd08c585e647ae3cebcb3e6f34186b4c67e
parent 46b0ff63e7579ab4e8bf50a37a56818efad0e52e
parent 4f2794eecbc855bb26943c9e30e5bbaaec0a8369
author ade@google.com <ade@google.com> 1286788524 -0700
committer ade@google.com <ade@google.com> 1286788524 -0700

Merged my changes with upstream changes from Joe.