Merge "update gitignore"
authorJohann <johannkoenig@google.com>
Tue, 28 Sep 2010 14:10:09 +0000 (07:10 -0700)
committerCode Review <code-review@webmproject.org>
Tue, 28 Sep 2010 14:10:09 +0000 (07:10 -0700)

Trivial merge