fix accidental merge issue with pull request #16

https://github.com/juju/juju/pull/16
Merge pull request #32 from johnweldon/fix-mr-16

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