merge in kberg's changes
authorDan Vanderkam <danvk@google.com>
Mon, 31 Jan 2011 15:42:47 +0000 (10:42 -0500)
committerDan Vanderkam <danvk@google.com>
Mon, 31 Jan 2011 15:42:47 +0000 (10:42 -0500)
commit4127accfc05f5b051c84b6a623f11c7230e237d9
treedc7ba120ae772a6c66f25f517b97ba82e36484f7
parentfccae3c0438703452b1a077421c1074982dd4344
parentb598af955825e116f3d303862fc6f96998ae8aaa
merge in kberg's changes