Merge "use relative include path"
authorJohn Koleszar <jkoleszar@google.com>
Tue, 28 Jun 2011 19:52:48 +0000 (12:52 -0700)
committerCode Review <code-review@webmproject.org>
Tue, 28 Jun 2011 19:52:48 +0000 (12:52 -0700)

Trivial merge