[nodejs-slide/f18: 10/10] Merge branch 'master' into el6

[Jamie Nguyen]

commit c20fff1d5aaec0bc7df2a5a3002c98a57ca93efa
Merge: 233c1a0 420470d
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Tue Sep 3 20:46:14 2013 +0100

    Merge branch 'master' into el6

 .gitignore        |    2 ++
 nodejs-slide.spec |   31 ++++++++++++++++++++++++-------
 sources           |    2 +-
 3 files changed, 27 insertions(+), 8 deletions(-)
---