Merge "Fix issue 262, vp8cx_pack_tokens_into_partitions_armv5"
authorJohann <johannkoenig@google.com>
Tue, 25 Jan 2011 20:49:52 +0000 (12:49 -0800)
committerCode Review <code-review@webmproject.org>
Tue, 25 Jan 2011 20:49:52 +0000 (12:49 -0800)

Trivial merge