Merge pull request #4193 from t-nelson/parallel_build_fixes_the_last_maybe
authorTrent Nelson <trent.a.b.nelson@gmail.com>
Thu, 13 Feb 2014 16:20:23 +0000 (09:20 -0700)
committerTrent Nelson <trent.a.b.nelson@gmail.com>
Thu, 13 Feb 2014 16:20:23 +0000 (09:20 -0700)
Parallel build fixes the last maybe


Trivial merge