Merge remote branch 'internal/upstream' into HEAD
authorJohn Koleszar <jkoleszar@google.com>
Thu, 24 Feb 2011 05:05:08 +0000 (00:05 -0500)
committerJohn Koleszar <jkoleszar@google.com>
Thu, 24 Feb 2011 05:05:08 +0000 (00:05 -0500)
1  2 
configure

diff --cc configure
Simple merge