Merge branch 'origin/eider' into master
authorJohn Koleszar <jkoleszar@google.com>
Mon, 4 Jun 2012 22:11:42 +0000 (15:11 -0700)
committerJohn Koleszar <jkoleszar@google.com>
Mon, 11 Jun 2012 19:06:53 +0000 (12:06 -0700)
Change-Id: I79fd7bd18aa1af41cd066ccc3d1cd16744b9c8d1


Trivial merge