Merge remote-tracking branch 'smcv/trail'
authorJoey Hess <joey@kitenet.net>
Thu, 5 Apr 2012 16:22:41 +0000 (12:22 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 5 Apr 2012 16:22:41 +0000 (12:22 -0400)

Trivial merge