Merge "Remove rotting NDS_NITRO code."
authorJohn Koleszar <jkoleszar@google.com>
Wed, 13 Jul 2011 12:46:30 +0000 (05:46 -0700)
committerCode Review <code-review@webmproject.org>
Wed, 13 Jul 2011 12:46:30 +0000 (05:46 -0700)

Trivial merge