Merge "Cleaning up probability/cost functions."
authorDmitry Kovalev <dkovalev@google.com>
Wed, 20 Nov 2013 00:08:16 +0000 (16:08 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 20 Nov 2013 00:08:16 +0000 (16:08 -0800)

Trivial merge