[node-gyp/f18: 2/2] Merge branch 'master' into f18

[T.C. Hollingsworth]

commit 951c8381397d69c8e2fcfd382dd9c769b8bb8356
Merge: 61b39dc aa941db
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Tue Jul 30 11:06:44 2013 -0700

    Merge branch 'master' into f18

 node-gyp.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---