Merge new origin commits.
authorPeter Avalos <pavalos@dragonflybsd.org>
Sat, 24 Jan 2015 20:15:30 +0000 (12:15 -0800)
committerPeter Avalos <pavalos@dragonflybsd.org>
Sat, 24 Jan 2015 20:15:30 +0000 (12:15 -0800)

Trivial merge