ref: d8216b19b6aaf74dbed042c989ad0c1219e35b86
parent: 8b1a14d12feed0ae0d304397fcdf49ef1057b81d
parent: 14c9fce8e417cb8865c0ddf98ca23a39329c9690
author: John Koleszar <jkoleszar@google.com>
date: Wed May 2 12:22:34 EDT 2012
Merge "Fix compiler warnings" into eider