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

[T.C. Hollingsworth]

commit cdf4bf0cb22053649f0149e47710d82418531eb8
Merge: bb7da28 c9de479
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Wed May 29 02:27:22 2013 -0700

    Merge branch 'master' into f18

 libuv.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---