Merge "Add OS/2 supports"
authorJohn Koleszar <jkoleszar@google.com>
Wed, 8 Feb 2012 19:00:55 +0000 (11:00 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 8 Feb 2012 19:00:55 +0000 (11:00 -0800)

Trivial merge