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)

Trivial merge