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

[T.C. Hollingsworth]

commit 69a5b049d7e007d803b6959a001bb2ca6705d32d
Merge: 78e9e61 6ba4fc6
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Thu Apr 25 01:26:04 2013 -0700

    Merge branch 'master' into f18

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