rails/rails — pull request #6581 by zmack (2012-06-01 07:17:43+00:00)
Title: Properly add duration parts

Fixes the issues reported by #6559