[nodejs/el6: 2/2] Merge branch 'master' into el6

[T.C. Hollingsworth]

commit ec039fe018de52bbe7ad4a22731f0f4270041da6
Merge: 014aaf9 e69a9d5
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Wed Jan 2 00:17:53 2013 -0700

    Merge branch 'master' into el6

 macros.nodejs       |    1 +
 nodejs-symlink-deps |   14 +++++++++++---
 nodejs.spec         |    5 ++++-
 3 files changed, 16 insertions(+), 4 deletions(-)
---