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

[T.C. Hollingsworth]

commit 991187e433b53782e8c7d0801039482756636642
Merge: 6938afd 86e6c79
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Thu Dec 19 11:12:03 2013 -0700

    Merge branch 'master' into f18

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