Merged edit

RJHall merged this into Stellar kinematics on 12 October 2009