Merge r31460 from trunk: decrease time to make nightly tarballs.

Packaging; no review needed.