Adam Buchbinder - 2010-04-23

Patch against current git.