Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly

Conflicts:
	UPDATING

diff --cc Makefile_upgrade.inc
Simple merge

diff --cc UPDATING
index d8e4073,5a3b146..a2a617c
--- 1/UPDATING
--- 2/UPDATING
+++ b/UPDATING
@@@ -7,26 -7,19 +7,31 @@@
  #
  # If you discover any problem, please contact the bugs@lists.dragonflybsd.org
  # mailing list with the details.
- #
- # $DragonFly: src/UPDATING,v 1.26 2008/09/15 20:03:36 thomas Exp $
  
  +-----------------------------------------------------------------------+
- +         UPGRADING DRAGONFLY FROM 2.8 to later versions
+++         UPGRADING DRAGONFLY FROM 2.8 to later versions                +
 ++-----------------------------------------------------------------------+
 +
 +pkg_radd settings
 +=================
 +
 +The config file for pkg_radd has moved from /etc/settings.conf to 
 +/etc/pkg_radd.conf.  Save the contents of settings.conf before upgrading
 +if this is needed.  This warning only applies if /etc/settings.conf 
 +exists.  pkg_radd will continue to work with defaults.
 +
 ++-----------------------------------------------------------------------+
- +         20100924
- +         UPGRADING DRAGONFLY FROM 2.6 to 2.8 or HEAD
+ +         20100927                                                    +
+ +         UPGRADING DRAGONFLY FROM 2.6 to 2.8 or HEAD                 +
  +-----------------------------------------------------------------------+
  
+ OpenSSL
+ ========
+ 
+ OpenSSL has been upgraded, and SHLIB_MAJOR was bumped for libssh and libcrypto.
+ This shouldn't break any 3rd-party software, but you'll need to recompile your
+ 3rd-party software if you want it to link against the new version of OpenSSL.
+ 
  Loader
  =======