Pulling in changes from darcs patch: