Merge remote branch 'internal/upstream-experimental' into HEAD
authorJohn Koleszar <jkoleszar@google.com>
Mon, 8 Nov 2010 13:34:46 +0000 (08:34 -0500)
committerJohn Koleszar <jkoleszar@google.com>
Mon, 8 Nov 2010 13:34:46 +0000 (08:34 -0500)
Conflicts:
configure

Change-Id: I952d3a50ddd243990d37c5f931bd91a4244d6284


Trivial merge