Use the name/address from the %changelog where author names on commits differed. This makes git shortlog output more consistent.
Todd Zullinger