multiple payment options, RT#23741
Merge branch 'master' of git.freeside.biz:/home/git/freeside