Merge cayuga release into master branch
authorJohn Koleszar <jkoleszar@google.com>
Thu, 4 Aug 2011 17:30:15 +0000 (10:30 -0700)
committerJohn Koleszar <jkoleszar@google.com>
Thu, 4 Aug 2011 18:22:41 +0000 (14:22 -0400)
Change-Id: I54ab3c22d281efe69af9c9108fcbfadd3cc747ee


Trivial merge