Merge remote-tracking branch 'remotes/smcv/ready/careful-eval'
authorJoey Hess <joey@kitenet.net>
Sun, 23 Feb 2014 18:21:13 +0000 (14:21 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 23 Feb 2014 18:21:13 +0000 (14:21 -0400)

Trivial merge