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

[T.C. Hollingsworth]

commit d5aa6b8e53775a9eb3a6a5d5a1bccbfeb0299c93
Merge: b4c4cd3 ce55348
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Tue Aug 27 02:18:18 2013 -0700

    Merge branch 'master' into f18

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