K 10
svn:author
V 5
markj
K 8
svn:date
V 27
2013-05-29T22:30:29.739433Z
K 7
svn:log
V 181
Revert my previous merge. There's a variable name difference between head
and stable (dirfd vs. dir_fd) and I managed to get it wrong again when I
did the MFC, even after I tested.

END