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

[T.C. Hollingsworth]

commit 7a3f20f5a3290bcab079a501f44100416867521e
Merge: 4067b0a 346591f
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Wed Jul 10 02:44:05 2013 -0700

    Merge branch 'master' into f18

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