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

[T.C. Hollingsworth]

commit 06270801e3aa96ed0330b0a2a04ee729b772245b
Merge: d5aa6b8 c3f343f
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Fri Sep 6 15:16:51 2013 -0700

    Merge branch 'master' into f18

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