Merge remote-tracking branch 'ry/v0.8' into master

Conflicts:
	AUTHORS
	ChangeLog
	src/node_version.h
	test/simple/test-buffer.js

1 files changed, 6 insertions, 1 deletions

diff --git a/tools/install.py b/tools/install.py
index d82d9ea844..c8ad828c1d 100755
--- a/tools/install.py
+++ b/tools/install.py
@@ -1,7 +1,12 @@
 #!/usr/bin/env python
 
 import errno
-import json
+
+try:
+  import json
+except ImportError:
+  import simplejson as json
+
 import os
 import re
 import shutil