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

[T.C. Hollingsworth]

commit 61b39dc982d90fa20061b042bf9c943b4c7c38ef
Merge: 2cefa73 bfb65c1
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Fri Jul 12 05:42:03 2013 -0700

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	node-gyp.spec
    	sources

 .gitignore                |    1 +
 node-gyp-addon-gypi.patch |   66 ++++++++++++++++++++++++++-------------------
 node-gyp.spec             |   12 ++++----
 sources                   |    2 +-
 4 files changed, 46 insertions(+), 35 deletions(-)
---