Re-merges resolved master.
authordsc <david.schoonover@gmail.com>
Mon, 16 May 2011 09:10:27 +0000 (02:10 -0700)
committerdsc <david.schoonover@gmail.com>
Mon, 16 May 2011 09:10:27 +0000 (02:10 -0700)
commit04599d492fb1b2451bdd19092a907e3b949f6c78
tree0f6fa21cd90a24f673583cedce0f8cb8ac93e729
parent2c10354e6c6dd7f43e3aa3ba0e701a5ee5cdf168
Re-merges resolved master.