author | Jean-Baptiste Queru <jbq@google.com> | |
Fri, 19 Dec 2008 15:57:30 +0000 (07:57 -0800) | ||
committer | Jean-Baptiste Queru <jbq@google.com> | |
Fri, 19 Dec 2008 15:57:30 +0000 (07:57 -0800) |
Conflicts:
libc/include/dirent.h
libc/include/dirent.h
Trivial merge