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

[T.C. Hollingsworth]

commit de339ec442f4318bc84771d0820309ef55f1d078
Merge: b83cc57 e7939ff
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Fri Oct 18 16:04:09 2013 -0700

    Merge branch 'master' into f18

 .gitignore |    1 +
 libuv.spec |    6 +++++-
 sources    |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
---