I forgot to check in some code
Merge pull request #102 from zenoss/feature/ZEN-9685

I forgot to check in some code