Merging changes from trunk
authormike tsai <mtsai@mtsai>
Thu, 22 Oct 2009 23:05:00 +0000 (16:05 -0700)
committermike tsai <mtsai@mtsai>
Thu, 22 Oct 2009 23:05:00 +0000 (16:05 -0700)

Trivial merge