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

[T.C. Hollingsworth]

commit b4c4cd3a213306084a0c4bba96549f959b70bfb5
Merge: 7a3f20f 38922a9
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Thu Jul 25 14:09:10 2013 -0700

    Merge branch 'master' into f18

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