Merge function and program indices, instead of the previous variable and
program merge.


git-svn-id: https://svn.r-project.org/ESS/trunk@5451 0bbaf3bd-34e0-0310-bf65-c717079852d4
Reverse function/program merge so that we just use function index to get
both.


git-svn-id: https://svn.r-project.org/ESS/trunk@5452 0bbaf3bd-34e0-0310-bf65-c717079852d4