[nodejs/el6] new upstream release 0.10.8 (cherry picked from commit f7500b9771b9d3d221b931ccc7c30856dc7dc394)

[T.C. Hollingsworth]

commit 6aa8da6f9ab02c46c1a7dd7058421033454b1d21
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Tue May 28 20:44:29 2013 -0700

    new upstream release 0.10.8
    (cherry picked from commit f7500b9771b9d3d221b931ccc7c30856dc7dc394)
    
    Conflicts:
    	.gitignore

 .gitignore |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8fbc2ed..00b6f2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,9 +7,6 @@
 /node-v0.10.3.tar.gz
 /node-v0.10.4.tar.gz
 /node-v0.10.5.tar.gz
-<<<<<<< HEAD
-=======
 /node-v0.10.6.tar.gz
 /node-v0.10.7-stripped.tar.gz
->>>>>>> 9e89193... add the new stripped tarball to sources
 /node-v0.10.8-stripped.tar.gz