Changes 2010-10-22

Revert changes on 2010-10-06