of the patch that did not conflict with the previous commit. Darren should take a look at it, and keep what it apropriate.