Commit ec6f9c2fd03a49d1e91cbaefa5bdbbfb35dff92e

Behdad Esfahbod 2011-04-21T18:35:58

Further simplify object handling