Adam Buchbinder - 2010-04-26

Patch against current git.