ref: 56417a3075c5baa6dc8ad6f708547190458fbaa5
parent: e28e08146e468c55e435d19b2c95654e04fe3044
parent: 9eb0b2f1daf61d06b686b52915cdd46e8ee9a9ee
author: John Koleszar <jkoleszar@google.com>
date: Thu Aug 4 13:05:55 EDT 2011
(Re)Merge branch 'master' into cayuga Corrected the merge direction this time, so that running `git describe` on the master branch finds v0.9.7 as the most recent tag. Change-Id: I9e7b5d473c26e670c6d9a76f5c03fa617690651d