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

[Justin C. Sherrill]

commit 65a9d5ece92647ec3ee3ce9763a73fe754dd186d
Merge: 486ae76 ab6be9e
Author: Justin C. Sherrill <justin at shiningsilence.com>
Date:   Tue Apr 2 21:38:42 2013 -0400

    Merge branch 'DragonFly_RELEASE_3_4' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into DragonFly_RELEASE_3_4
    
    Conflicts:
    	sys/sys/param.h

Summary of changes:

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/65a9d5ece92647ec3ee3ce9763a73fe754dd186d


-- 
DragonFly BSD source repository