Incorporate the patch from pbulk LOCALPATCHES
Merge branch 'pkgsrc_2013Q3' into joyent/feature/gccruntime/2013Q3
Merge branch 'pkgsrc_2013Q3' into joyent/feature/miscfix/2013Q3
Merge branch 'pkgsrc_2013Q3' into joyent/feature/pbulkmulti/2013Q3
Merge branch 'pkgsrc_2013Q3' into joyent/feature/smf/2013Q3
Merge branch 'joyent/feature/miscfix/2013Q3' of github.com:joyent/pkgsrc into joyent/feature/miscfix/2013Q3
Pullup ticket #4256 - requested by spz
lang/python26: security update

Revisions pulled up:
- lang/python26/Makefile                                        1.56
- lang/python26/PLIST.common                                    1.15
- lang/python26/buildlink3.mk                                   1.6
- lang/python26/dist.mk                                         1.4
- lang/python26/distinfo                                        1.52
- lang/python26/patches/patch-CVE-2013-4238                     deleted
- lang/python26/patches/patch-al                                1.12

---
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Wed Nov  6 07:25:49 UTC 2013

   Modified Files:
   	pkgsrc/lang/python26: Makefile PLIST.common buildlink3.mk dist.mk
   	    distinfo
   	pkgsrc/lang/python26/patches: patch-al
   Removed Files:
   	pkgsrc/lang/python26/patches: patch-CVE-2013-4238

   Log Message:
   Python 2.6.9 is a security-fix source-only release for Python 2.6.8, fixing several reported security issues: issue 16037, issue 16038, issue 16039, issue 16040, issue 16041, and issue 16042 (CVE-2013-1752, long lines consuming too much memory), as well as issue 14984 (security enforcement on $HOME/.netrc files), issue 16248 (code execution vulnerability in tkinter), and issue 18709 (CVE-2013-4238, SSL module handling of NULL bytes inside subjectAltName).
Pullup ticket #4256.
Pullup ticket #4257 - requested by taca
www/drupal6: security update

Revisions pulled up:
- www/drupal6/Makefile                                          1.44
- www/drupal6/distinfo                                          1.28

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Thu Nov 21 15:13:09 UTC 2013

   Modified Files:
   	pkgsrc/www/drupal6: Makefile distinfo

   Log Message:
   Update drupal6 to 6.29 (Drupal 6.29).

   Drupal 6.29, 2013-11-20
   ----------------------
   - Fixed security issues (multiple vulnerabilities), see SA-CORE-2013-003.
Pullup ticket #4258 - requested by taca
www/drupal7: security update

Revisions pulled up:
- www/drupal7/Makefile                                          1.22
- www/drupal7/distinfo                                          1.15

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Thu Nov 21 15:14:11 UTC 2013

   Modified Files:
   	pkgsrc/www/drupal7: Makefile distinfo

   Log Message:
   Update drupal7 to 7.24 (Drupal 7.24).

   Drupal 7.24, 2013-11-20
   ----------------------
   - Fixed security issues (multiple vulnerabilities), see SA-CORE-2013-003.
Pullup tickets #4257 and #4258.
Merge branch 'pkgsrc_2013Q3' into joyent/feature/gccruntime/2013Q3
Merge branch 'pkgsrc_2013Q3' into joyent/feature/miscfix/2013Q3
Try out emacs24 vs libumem patch.
Merge branch 'pkgsrc_2013Q3' into joyent/feature/multiarch/2013Q3

Conflicts:
	lang/python26/distinfo
Merge branch 'pkgsrc_2013Q3' into joyent/feature/pbulkmulti/2013Q3
Merge branch 'pkgsrc_2013Q3' into joyent/feature/smf/2013Q3
Merge branch 'joyent/feature/multiarch/2013Q3' into joyent/release/2013Q3
Merge branch 'joyent/feature/miscfix/2013Q3' into joyent/release/2013Q3
Merge branch 'joyent/feature/gccruntime/2013Q3' into joyent/release/2013Q3