OpenMDAO/OpenMDAO-Framework — pull request #1725 by JustinSGray (2014-04-24 11:51:43+00:00)
Title: Updates for Brent for more flexibility

I Just fixed a couple of merge conflicts that popped up.

Closes #1719