Fixed Timestamp to always return an instance of the correct class

Ignore-this: 6f066c2e221d1c281fa5cede482b23b

darcs-hash:20100121131248-1e3d8-0184f198d874cbada8ee28ac45be5985c94affc3