Merges in sparrow work.
authordsc <david.schoonover@gmail.com>
Sun, 8 May 2011 05:31:15 +0000 (22:31 -0700)
committerdsc <david.schoonover@gmail.com>
Sun, 8 May 2011 05:31:15 +0000 (22:31 -0700)

Trivial merge