juju/juju — pull request #32 by johnweldon (2014-06-05 19:21:28+00:00)
Title: fix accidental merge issue with pull request #16

https://github.com/juju/juju/pull/16