Adam Buchbinder - 2008-09-29

Diff against SVN r1168.