Merge branch 'pkgsrc_2012Q4' into joyent/feature/miscfix/2012Q4
Pullup ticket #4005 - requested by marino
x11/xfce4-terminal: bug fix patch

Revisions pulled up:
- x11/xfce4-terminal/Makefile                                   1.28
- x11/xfce4-terminal/distinfo                                   1.7
- x11/xfce4-terminal/patches/patch-terminal_terminal-screen.c   1.1

---
   Module Name:	pkgsrc
   Committed By:	marino
   Date:		Tue Jan  8 01:23:19 UTC 2013

   Modified Files:
   	pkgsrc/x11/xfce4-terminal: Makefile distinfo
   Added Files:
   	pkgsrc/x11/xfce4-terminal/patches: patch-terminal_terminal-screen.c

   Log Message:
   x11/xfce4-terminal: PR#46926 PR#45448 Fix 100% CPU usage

   Patch provided by Dave Tyson has multiple confirmations that it fixes
   the issue of 100% CPU usage simply from opening terminal window.
Pullup ticket #4005.
Merge branch 'pkgsrc_2012Q4' into joyent/feature/miscfix/2012Q4
Backport trunk OpenSSH HPN patch site fix.
Merge branch 'joyent/feature/miscfix/2012Q4' into joyent/release/2012Q4