git: Merge remote-tracking branch 'origin/master'

[Peter Avalos]

commit 4c986ba71501e58e2d468c985b211e5405eeae2d
Merge: ca7b1affc72ea13d603d710a9c0356fc3859bf98 1948d087ae717c23a5bd84b0d38e54748248eb08
Author: Peter Avalos <pavalos at dragonflybsd.org>
Date:   Tue Apr 10 09:51:20 2012 -0700

    Merge remote-tracking branch 'origin/master'

Summary of changes:

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/4c986ba71501e58e2d468c985b211e5405eeae2d


-- 
DragonFly BSD source repository