Merge branch 'bali'
authorJohn Koleszar <jkoleszar@google.com>
Wed, 9 Mar 2011 19:11:28 +0000 (14:11 -0500)
committerJohn Koleszar <jkoleszar@google.com>
Wed, 9 Mar 2011 19:11:54 +0000 (14:11 -0500)
Change-Id: Icf18b4981afb12ef255fca431d4ba45860dd22c9


Trivial merge