Multiarch PLIST fix for x11/py-gtk2.
Merge branch 'joyent/feature/multiarch/2013Q2' into joyent/release/2013Q2_multiarch
Merge branch 'joyent/release/2013Q2_multiarch' into joyent/release/2013Q2_sngl