CiviMember - Error Calculating Fixed Period Membership End Date

Reported by Dave lange on 1.5. I recreated on trunk...
----------
End date calc is incorrect. In example below it SHOULD be Sep 30, 2007. I suspect the code is incorrectly factoring the fixed rollover day and is adding a year w/o comparing the fixed rollover day to the fixed start day (e.g. the code is ASSUMING that the fixed start day is always Jan 1).

------ example reported by dave lange --------

I've the following Membership type:
duration: 1 year
type: fixed
fixed start day: oct 1
fixed rollover day: aug 1

If I create a membership for an individual and enter only a join date of Nov 9, 2006 I get:
Member Since: Nov 9, 2006
Start Date: Oct 1, 2006
End Date: Sep 30, 2008 - huh???