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)
commit0e753ada42b4ded0b5336cf16eee42f790433e98
tree0657c2f6c82a0c10ed4da5be96fbd6c49d281534
parent1772068739e47eb45a8a7cebe9f594c6334b182f
parentf6c04131cc9952372e3f63de2db4edc9f8181fb2
Merging changes from trunk