Fixed an startup delay in xfwm4 caused by a gratuitous recursive grep
	modified:   ts/5.1/packages/base/etc/thinstation.functions
	modified:   ts/5.1/build
	new file:   ts/5.1/kernel/dependencies_package/iproute2
	modified:   ts/5.1/packages/adobereader/build/install
	modified:   ts/5.1/packages/adobereader/build/remove
	modified:   ts/5.1/packages/alsa/build/extra/etc/init.d/audio
	modified:   ts/5.1/packages/base/build/finalize
	modified:   ts/5.1/packages/base/etc/thinstation.defaults
	modified:   ts/5.1/packages/base/etc/thinstation.functions
	modified:   ts/5.1/packages/base/etc/thinstation.packages
	modified:   ts/5.1/packages/broadcom-sta/.dna
	new file:   ts/5.1/packages/epsonwf3k/.dna
	new file:   ts/5.1/packages/epsonwf3k/.gitignore
	new file:   ts/5.1/packages/epsonwf3k/build/install
	new file:   ts/5.1/packages/epsonwf3k/build/remove
	new file:   ts/5.1/packages/epsonwf3k/dependencies
	modified:   ts/5.1/packages/firefox/etc/TS.default/prefs.tpl
	modified:   ts/5.1/packages/gnome-core/build/install
	new file:   ts/5.1/packages/ica/build/finalize
	new file:   ts/5.1/packages/inkscape/.gitignore
	modified:   ts/5.1/packages/java/.gitignore
	modified:   ts/5.1/packages/nss/.dna
	new file:   ts/5.1/packages/sshagent/.dna
	new file:   ts/5.1/packages/sshagent/dependencies
	modified:   ts/5.1/packages/switchuser/sbin/session
	modified:   ts/5.1/packages/system-config-date/build/extra/lib/menu/system-config-date
	modified:   ts/5.1/packages/system-config-printer/build/extra/lib/menu/system-config-printer
	modified:   ts/5.1/packages/util-linux-ng/build/install
	modified:   ts/5.1/packages/xfwm4/build/extra/etc/xfwm4.functions
	modified:   ts/5.1/packages/xfwm4/build/extra/lib/menu/xfce4-appearance-settings
	modified:   ts/5.1/packages/xfwm4/build/extra/lib/menu/xfce4-display-settings
	modified:   ts/5.1/packages/xfwm4/build/extra/lib/menu/xfce4-keyboard-settings
	modified:   ts/5.1/packages/xfwm4/build/extra/lib/menu/xfce4-mouse-settings
	deleted:    ts/5.1/packages/xfwm4/build/extra/xfwm4/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
	deleted:    ts/5.1/packages/xfwm4/build/extra/xfwm4/etc/xfwm4.functions
	modified:   ts/5.1/packages/xfwm4/build/install
	modified:   ts/5.1/packages/xfwm4/dependencies
	new file:   ts/5.1/packages/xorg7-modesetting/.dna
	renamed:    ts/5.1/packages/xorg7-nvidia/dependencies -> ts/5.1/packages/xorg7-modesetting/dependencies
	deleted:    ts/5.1/packages/xorg7-nvidia/.dna
	deleted:    ts/5.1/packages/xorg7-nvidia/build/finalize
	deleted:    ts/5.1/packages/xorg7-nvidia/etc/udev/rules.d/00-nvidia.rules
	deleted:    ts/5.1/packages/xorg7-nvidia/etc/udev/scripts/nvidia.sh
	deleted:    ts/5.1/packages/xorg7-nvidia/lib/pixmaps/nvidia-settings_16x16.xpm
	deleted:    ts/5.1/packages/xorg7-nvidia/lib/pixmaps/nvidia-settings_32x32.xpm
	modified:   ts/ports/chroot/krb5-TS/.footprint
	modified:   ts/ports/chroot/krb5-TS/.md5sum
	modified:   ts/ports/chroot/krb5-TS/Pkgfile
	deleted:    ts/ports/chroot/krb5-TS/krb5-TS#1.10.3-1.pkg.tar.gz
	new file:   ts/ports/chroot/krb5-TS/krb5-TS#1.11.3-1.pkg.tar.gz
	modified:   ts/ports/chroot/pcsc-lite/.md5sum
	modified:   ts/ports/chroot/pcsc-lite/Pkgfile
	new file:   ts/ports/chroot/pcsc-lite/pcsc-lite#1.8.10-1.pkg.tar.gz
	deleted:    ts/ports/chroot/pcsc-lite/pcsc-lite#1.8.8-1.pkg.tar.gz
	modified:   ts/ports/components/aufs-util/.footprint
	modified:   ts/ports/components/aufs-util/Pkgfile
	deleted:    ts/ports/components/aufs-util/aufs-util#3.0-1.pkg.tar.gz
	new file:   ts/ports/components/aufs-util/aufs-util#3.9-1.pkg.tar.gz
	modified:   ts/ports/components/ccid/.md5sum
	modified:   ts/ports/components/ccid/Pkgfile
	deleted:    ts/ports/components/ccid/ccid#1.4.12-1.pkg.tar.gz
	new file:   ts/ports/components/ccid/ccid#1.4.14-1.pkg.tar.gz
	new file:   ts/ports/components/pidgin-sipe/.footprint
	new file:   ts/ports/components/pidgin-sipe/.md5sum
	new file:   ts/ports/components/pidgin-sipe/Pkgfile
	new file:   ts/ports/components/pidgin-sipe/pidgin-sipe#1.14.1-1.pkg.tar.gz
	modified:   ts/ports/components/rdesktop/Pkgfile
	modified:   ts/ports/components/rdesktop/rdesktop#1.7.1-1.pkg.tar.gz
	modified:   ts/ports/components/samba/.footprint
	modified:   ts/ports/components/samba/.md5sum
	modified:   ts/ports/components/samba/Pkgfile
	renamed:    ts/ports/components/samba/samba#3.6.9-1.pkg.tar.gz -> ts/ports/components/samba/samba#3.6.20-1.pkg.tar.gz
	new file:   ts/ports/components/xerces-c/.footprint
	new file:   ts/ports/components/xerces-c/.md5sum
	new file:   ts/ports/components/xerces-c/Pkgfile
	new file:   ts/ports/components/xerces-c/xerces-c#3.1.1-1.pkg.tar.gz
	new file:   ts/ports/gnome/webkit/.footprint
	new file:   ts/ports/gnome/webkit/.md5sum
	new file:   ts/ports/gnome/webkit/Pkgfile
	new file:   ts/ports/gnome/webkit/webkit#1.7.5-1.pkg.tar.gz
	modified:   ts/ports/kernel-modules/aufs-patches/.md5sum
	modified:   ts/ports/kernel-modules/aufs-patches/Pkgfile
	modified:   ts/ports/kernel-modules/aufs-patches/aufs-patches#3.10-1.pkg.tar.gz
	new file:   ts/ports/kernel-modules/aufs-patches/patch4thepatch
	modified:   ts/ports/kernel-modules/aufs/.footprint
	modified:   ts/ports/kernel-modules/aufs/Pkgfile
	deleted:    ts/ports/kernel-modules/aufs/aufs#3.10-3.10.17.pkg.tar.gz
	new file:   ts/ports/kernel-modules/aufs/aufs#3.10-3.10.27.pkg.tar.gz
	modified:   ts/ports/kernel-modules/bbswitch/.footprint
	modified:   ts/ports/kernel-modules/bbswitch/Pkgfile
	deleted:    ts/ports/kernel-modules/bbswitch/bbswitch#0.7-3.10.17.pkg.tar.gz
	new file:   ts/ports/kernel-modules/bbswitch/bbswitch#0.7-3.10.27.pkg.tar.gz
	modified:   ts/ports/kernel-modules/broadcom-sta/.footprint
	modified:   ts/ports/kernel-modules/broadcom-sta/.md5sum
	modified:   ts/ports/kernel-modules/broadcom-sta/Pkgfile
	deleted:    ts/ports/kernel-modules/broadcom-sta/broadcom-sta#5.100.82.112-3.10.17.pkg.tar.gz
	new file:   ts/ports/kernel-modules/broadcom-sta/broadcom-sta#6.30.223.141-3.10.27.pkg.tar.gz
	modified:   ts/ports/kernel-modules/broadcom-sta/linux-recent.patch
	modified:   ts/ports/kernel-modules/cryptodev-linux/.footprint
	modified:   ts/ports/kernel-modules/cryptodev-linux/Pkgfile
	deleted:    ts/ports/kernel-modules/cryptodev-linux/cryptodev-linux#1.6-3.10.17.pkg.tar.gz
	new file:   ts/ports/kernel-modules/cryptodev-linux/cryptodev-linux#1.6-3.10.27.pkg.tar.gz
	modified:   ts/ports/kernel-modules/kernel-TS/.footprint
	modified:   ts/ports/kernel-modules/kernel-TS/.md5sum
	modified:   ts/ports/kernel-modules/kernel-TS/Pkgfile
	renamed:    ts/ports/kernel-modules/kernel-TS_SMP/kernel-TS_SMP#3.10.17-1.pkg.tar.gz -> ts/ports/kernel-modules/kernel-TS/kernel-TS#3.10.27-1.pkg.tar.gz
	modified:   ts/ports/kernel-modules/kernel-TS/ts.config
	modified:   ts/ports/kernel-modules/kernel-TS_SMP/.footprint
	modified:   ts/ports/kernel-modules/kernel-TS_SMP/.md5sum
	modified:   ts/ports/kernel-modules/kernel-TS_SMP/Pkgfile
	renamed:    ts/ports/kernel-modules/kernel-TS/kernel-TS#3.10.17-1.pkg.tar.gz -> ts/ports/kernel-modules/kernel-TS_SMP/kernel-TS_SMP#3.10.27-1.pkg.tar.gz
	modified:   ts/ports/kernel-modules/kernel-TS_SMP/ts.config
	deleted:    ts/ports/kernel-modules/nvidia/.footprint
	deleted:    ts/ports/kernel-modules/nvidia/.md5sum
	deleted:    ts/ports/kernel-modules/nvidia/Pkgfile
	deleted:    ts/ports/kernel-modules/nvidia/nvidia#325.15-3.10.17.pkg.tar.gz
	modified:   ts/ports/kernel-modules/open-vm-tools/.footprint
	modified:   ts/ports/kernel-modules/open-vm-tools/Pkgfile
	modified:   ts/ports/kernel-modules/open-vm-tools/open-vm-tools#2013.04.16-1098359-1.pkg.tar.gz
	modified:   ts/unwind_cache/broadcom-sta.turbo
	new file:   ts/unwind_cache/epsonwf3k.turbo
	modified:   ts/unwind_cache/nss.turbo
	new file:   ts/unwind_cache/sshagent.turbo
	new file:   ts/unwind_cache/xorg7-modesetting.turbo
	modified:   ts/unwind_cache/xorg7-nvidia.turbo
	modified:   ts/wind_cache/broadcom-sta.turbo
	new file:   ts/wind_cache/epsonwf3k.turbo
	modified:   ts/wind_cache/nss.turbo
	new file:   ts/wind_cache/sshagent.turbo
	new file:   ts/wind_cache/xorg7-modesetting.turbo
	modified:   ts/wind_cache/xorg7-nvidia.turbo
	modified:   usr/ports/core/iproute2/.footprint
	modified:   usr/ports/core/iproute2/.md5sum
	modified:   usr/ports/core/iproute2/Pkgfile
	deleted:    usr/ports/core/iproute2/iproute2#2.6.39-1.pkg.tar.gz
	new file:   usr/ports/core/iproute2/iproute2#3.10.0-1.pkg.tar.gz
	deleted:    usr/ports/core/iproute2/iproute2-2.6.39.patch
	deleted:    usr/ports/core/iproute2/net.iproute2
	modified:   usr/ports/core/openssh/.md5sum
	modified:   usr/ports/core/openssh/Pkgfile
	deleted:    usr/ports/core/openssh/openssh#6.3p1-1.pkg.tar.gz
	new file:   usr/ports/core/openssh/openssh#6.4p1-1.pkg.tar.gz
	modified:   usr/ports/opt/alsa-lib/.footprint
	modified:   usr/ports/opt/alsa-lib/.md5sum
	modified:   usr/ports/opt/alsa-lib/Pkgfile
	deleted:    usr/ports/opt/alsa-lib/alsa-lib#1.0.24.1-1.pkg.tar.gz
	new file:   usr/ports/opt/alsa-lib/alsa-lib#1.0.27.2-1.pkg.tar.gz
	modified:   usr/ports/opt/alsa-utils/.footprint
	modified:   usr/ports/opt/alsa-utils/.md5sum
	modified:   usr/ports/opt/alsa-utils/Pkgfile
	deleted:    usr/ports/opt/alsa-utils/alsa-utils#1.0.24.2-1.pkg.tar.gz
	new file:   usr/ports/opt/alsa-utils/alsa-utils#1.0.27.2-1.pkg.tar.gz
	modified:   usr/ports/opt/nspr/.md5sum
	modified:   usr/ports/opt/nspr/Pkgfile
	deleted:    usr/ports/opt/nspr/nspr#4.10-1.pkg.tar.gz
	new file:   usr/ports/opt/nspr/nspr#4.10.2-1.pkg.tar.gz
	modified:   usr/ports/opt/nss/.md5sum
	modified:   usr/ports/opt/nss/Pkgfile
	deleted:    usr/ports/opt/nss/nss#3.15.1-2.pkg.tar.gz
	new file:   usr/ports/opt/nss/nss#3.15.3-1.pkg.tar.gz
	modified:   usr/ports/opt/sqlite3/.md5sum
	modified:   usr/ports/opt/sqlite3/Pkgfile
	deleted:    usr/ports/opt/sqlite3/sqlite3#3.8.0.2-1.pkg.tar.gz
	new file:   usr/ports/opt/sqlite3/sqlite3#3.8.1-1.pkg.tar.gz
	modified:   README
	new file:   ts/5.1/packages/icons-hicolor/build/extra/lib/icons/hicolor/scalable/apps/Configuration.svg
Re-Add xorg7-nvidia as xorg7_nvidia which will download and compile during the first build.
	modified:   ts/5.1/build.conf.example
	modified:   ts/5.1/build.urls
	modified:   ts/5.1/conf/default/build.conf.example
	modified:   ts/5.1/conf/devstation/build.conf.example
	modified:   ts/5.1/conf/freerdp/build.conf.example
	modified:   ts/5.1/conf/installer/build.conf.example
	modified:   ts/5.1/conf/xfce/build.conf.example
	new file:   ts/5.1/packages/xorg7_nvidia/.dna
	new file:   ts/5.1/packages/xorg7_nvidia/build/extra/etc/udev/rules.d/00-nvidia.rules
	new file:   ts/5.1/packages/xorg7_nvidia/build/extra/etc/udev/scripts/nvidia.sh
	new file:   ts/5.1/packages/xorg7_nvidia/build/extra/lib/pixmaps/nvidia-settings_16x16.xpm
	new file:   ts/5.1/packages/xorg7_nvidia/build/extra/lib/pixmaps/nvidia-settings_32x32.xpm
	new file:   ts/5.1/packages/xorg7_nvidia/build/finalize
	new file:   ts/5.1/packages/xorg7_nvidia/build/install
	new file:   ts/5.1/packages/xorg7_nvidia/build/remove
	new file:   ts/5.1/packages/xorg7_nvidia/dependencies
	new file:   ts/unwind_cache/xorg7_nvidia.turbo
	new file:   ts/wind_cache/xorg7_nvidia.turbo
Finish updating the xorg7_nvidia package
	modified:   ts/5.1/packages/xorg7_nvidia/build/extra/etc/udev/scripts/nvidia.sh
	modified:   ts/5.1/packages/xorg7_nvidia/build/install
	new file:   gtkdialog/.footprint
	new file:   gtkdialog/.md5sum
	new file:   gtkdialog/Pkgfile
	new file:   gtkdialog/README
	new file:   gtkdialog/gtkdialog#0.8.3-2.pkg.tar.gz
	new file:   gtkdialog/nogladevte.patch
Merge remote-tracking branch 'upstream/master'
adapted our environment to the merged changes in upstream.