Bug 945939 - Use the pre-split value when numbering values; r=sunfish

--HG--
extra : rebase_source : f5f67cd31653619806caab33a71eb8a1d48c7d62