saperski - 2008-12-16

A proposed patch