[npm/el6: 2/2] Merge branch 'f19' into el6

[T.C. Hollingsworth]

commit f33f14fe228d4b908ed791efee3c6622789c4e8b
Merge: 61e3411 c6d4c41
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Wed Aug 7 20:41:49 2013 -0700

    Merge branch 'f19' into el6

 npm.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---