RobotLocomotion/drake — pull request #447 by avalenzu (2014-09-30 14:56:34+00:00)
Title: Fix testActiveCollisionOptions

Account for Bullet dependency explicitly in `testActiveCollisionOptions`. Also adds some support for `active_collision_options` that was missing in the terrain-only case.