Merge "shared object on mac osx" into experimental
authorJohn Koleszar <jkoleszar@google.com>
Fri, 27 Jul 2012 00:09:48 +0000 (17:09 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 27 Jul 2012 00:09:48 +0000 (17:09 -0700)

Trivial merge