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

[T.C. Hollingsworth]

commit 1630c3fdf5d34bb49d2bc53416e9d72ddaf51ddf
Merge: b9cb11a 2389283
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Wed Apr 24 08:44:47 2013 -0700

    Merge branch 'master' into f19

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