Barry Schwartz - 2010-06-01

The patch mentioned in the description