(Re)Merge branch 'master' into cayuga
authorJohn Koleszar <jkoleszar@google.com>
Thu, 4 Aug 2011 21:05:55 +0000 (17:05 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Thu, 4 Aug 2011 21:08:03 +0000 (17:08 -0400)
commit56417a3075c5baa6dc8ad6f708547190458fbaa5
tree15f78ad9c95d11bad18354786c34683381801f7e
parente28e08146e468c55e435d19b2c95654e04fe3044
parent9eb0b2f1daf61d06b686b52915cdd46e8ee9a9ee
(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