CiscoSystems/nova — pull request #3 by dontalton (2013-02-13 16:32:26+00:00)
Title: Merge folsom-proposed into folsom

Merging upstream 2012.2.3 into our folsom branch.