[nodejs-lockfile/f18: 4/4] Merge branch 'master' into el6

[Jamie Nguyen]

commit 37a3f2bb56a26d0daf3a136116e6b2d11bad7b65
Merge: 672a748 d44d5db
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Sat Sep 7 13:46:26 2013 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	nodejs-lockfile.spec

 .gitignore           |    2 +-
 nodejs-lockfile.spec |   22 +++++++++++++++++-----
 sources              |    2 +-
 3 files changed, 19 insertions(+), 7 deletions(-)
---
diff --cc .gitignore
index 8f34943,0aecd0a..62445d2
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,5 +1,2 @@@
 -/lockfile-0.2.1.tgz
 -/lockfile-0.3.0.tgz
 -/lockfile-0.3.4.tgz
  /lockfile-0.4.0.tgz
- 
+ /lockfile-0.4.2.tgz