[nodejs-read-installed/f18: 3/3] Merge branch 'master' into el6

[Jamie Nguyen]

commit 4e814596665d5ef90ecf8331de36b7e5c1437646
Merge: e3a70b1 1e061e5
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Sat Sep 7 13:58:19 2013 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	nodejs-read-installed.spec

 .gitignore                 |    1 +
 nodejs-read-installed.spec |   20 +++++++++++++++-----
 sources                    |    2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)
---