ref: 9f988a2edfbdec42dd09bdc14f27b41bcd388377
parent: 9ab47772bd026885826e15c1fbb5f76e38946ae9
parent: 5d2cb7ead0696078f9a69d89884a90f66fac6540
author: Jim Bankoski <jimbankoski@google.com>
date: Mon Aug 5 10:02:02 EDT 2013
Merge "cleanups after bw bh code"