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

[T.C. Hollingsworth]

commit fc15f5485ae045a6244fc8b5994376b227d38a01
Merge: de339ec bd52e48
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Tue Nov 12 14:15:44 2013 -0700

    Merge branch 'master' into f18

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