[libuv/f18: 2/2] Merge branch 'master' into f18

[T.C. Hollingsworth]

commit bb7da287d557890125a1f5dafa64e720d35589b9
Merge: 8e1da01 e45aa4a
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Tue May 28 22:49:34 2013 -0700

    Merge branch 'master' into f18

 .gitignore |    1 +
 sources    |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
---