ref: 256ee0009395a38df33e88f07bcbe2ef3b783534
parent: 2fd20eb37d3221f17150f64e9844fc9a1086cb49
parent: 86a9dec73cb1a7c05f33f0ed5b5134882d831de9
author: Jim Bankoski <jimbankoski@google.com>
date: Tue Jul 23 02:58:28 EDT 2013
Merge "clean up bw, bh"