Merge branch 'make-jobs'
authorTaylor R Campbell <campbell@mumble.net>
Wed, 29 May 2013 14:25:00 +0000 (14:25 +0000)
committerTaylor R Campbell <campbell@mumble.net>
Wed, 29 May 2013 14:25:00 +0000 (14:25 +0000)

Trivial merge