Merge "Fix flockfile(3) and friends for stdin/stdout/stderr too."
authorElliott Hughes <enh@google.com>
Wed, 19 Nov 2014 23:48:19 +0000 (23:48 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 19 Nov 2014 23:48:19 +0000 (23:48 +0000)

Trivial merge