Merge branch 'joyent/feature/miscfix/2013Q4' of github.com:joyent/pkgsrc into joyent/feature/miscfix/2013Q4
Backport bash security fixes to 2014Q2.

Conflicts:
	shells/bash/Makefile
	shells/bash/distinfo
Merge branch 'joyent/feature/miscfix/2013Q4' into joyent/release/2013Q4