@everett-toews made a change to the file (yesterday) which caused the conflict with my change. Now resolved. Running tests and will update in a bit.
--- Reply to this email directly or view it on GitHub: https://github.com/jclouds/jclouds/pull/72#issuecomment-21958739
